diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml new file mode 100644 index 00000000..1a23ea42 --- /dev/null +++ b/.github/blunderbuss.yml @@ -0,0 +1,7 @@ +# Configuration for the Blunderbuss GitHub app. For more info see +# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +assign_prs_by: +- labels: + - samples + to: + - googleapis/java-samples-reviewers \ No newline at end of file diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 9db46c34..db0ecf9f 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "a01092ae56ebe94074bb64b8ffc50a910f600ec1" + "sha": "775a38cb03a8e8f52496bb3032d5fe6835962260" } }, { diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index e2d841d6..7513acae 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index bc1554ae..2b6cdbc9 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-v') steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.kokoro/common.sh b/.kokoro/common.sh index a8d0ea04..ace89f45 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -25,7 +25,6 @@ function retry_with_backoff { # allow a failures to continue set +e - echo "${command}" ${command} exit_code=$? diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 3c482cbc..16126d2e 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -20,19 +20,22 @@ python3 -m pip install gcp-releasetool python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script source $(dirname "$0")/common.sh +source $(dirname "$0")/../common.sh MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ - --settings ${MAVEN_SETTINGS_FILE} \ - -DskipTests=true \ - -DperformRelease=true \ - -Dgpg.executable=gpg \ - -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} +# attempt to stage 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DskipTests=true \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} if [[ -n "${AUTORELEASE_PR}" ]] then diff --git a/CHANGELOG.md b/CHANGELOG.md index 43bb7f0c..5886c1d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.7](https://www.github.com/googleapis/java-containeranalysis/compare/v1.2.6...v1.2.7) (2020-12-02) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#349](https://www.github.com/googleapis/java-containeranalysis/issues/349)) ([bf5e44d](https://www.github.com/googleapis/java-containeranalysis/commit/bf5e44d7c218d802ea8bcd7becdd7c193c763d61)) + ### [1.2.6](https://www.github.com/googleapis/java-containeranalysis/compare/v1.2.5...v1.2.6) (2020-11-17) diff --git a/README.md b/README.md index 482f6226..4bdf1697 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-containeranalysis:1.2.5' +compile 'com.google.cloud:google-cloud-containeranalysis:1.2.6' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.2.5" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.2.6" ``` ## Authentication diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index 342089c9..0fa505fb 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 1.2.6 + 1.2.7 pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.2.6 + 1.2.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.88.6 + 0.88.7 com.google.cloud google-cloud-containeranalysis - 1.2.6 + 1.2.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.2.6 + 1.2.7 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.88.6 + 0.88.7 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 89a74630..506b89fa 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 1.2.6 + 1.2.7 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 1.2.6 + 1.2.7 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index 79ef058d..f72f8937 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.2.6 + 1.2.7 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.6 + 1.2.7 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index 9f51cbe3..602f03d6 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.88.6 + 0.88.7 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.6 + 1.2.7 diff --git a/pom.xml b/pom.xml index 6cdd5ea7..3dc06d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 1.2.6 + 1.2.7 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -70,33 +70,33 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.2.6 + 1.2.7 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.88.6 + 0.88.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.88.6 + 0.88.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.2.6 + 1.2.7 com.google.cloud google-cloud-containeranalysis - 1.2.6 + 1.2.7 com.google.cloud google-cloud-shared-dependencies - 0.15.0 + 0.16.0 pom import diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index f760e552..a14278c2 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.2.6 + 1.2.7 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.6 + 1.2.7 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index 7ae9f7d7..9bd8423d 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.88.6 + 0.88.7 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.6 + 1.2.7 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 63f2b1a6..69f841e2 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-containeranalysis - 1.2.5 + 1.2.6 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 28b859fe..b1a9111d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-containeranalysis - 1.2.5 + 1.2.6 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index b999d1af..10c37a1f 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 15.1.0 + 16.1.0 pom import diff --git a/synth.metadata b/synth.metadata index 09097503..686c926c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "fae167bb5d025916d2e2fac1dd4fb02800d411fe" + "sha": "db8f842ac78799c76c4cdb42cc189cf1e9294de8" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7d652819519dfa24da9e14548232e4aaba71a11c" + "sha": "943bb78606d035001123030067dffcc34f4645f2" } } ], @@ -57,6 +57,7 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", + ".github/blunderbuss.yml", ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/release-please.yml", diff --git a/versions.txt b/versions.txt index f437a70d..1354bf2c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:1.2.6:1.2.6 -proto-google-cloud-containeranalysis-v1beta1:0.88.6:0.88.6 -grpc-google-cloud-containeranalysis-v1beta1:0.88.6:0.88.6 -grpc-google-cloud-containeranalysis-v1:1.2.6:1.2.6 -google-cloud-containeranalysis:1.2.6:1.2.6 +proto-google-cloud-containeranalysis-v1:1.2.7:1.2.7 +proto-google-cloud-containeranalysis-v1beta1:0.88.7:0.88.7 +grpc-google-cloud-containeranalysis-v1beta1:0.88.7:0.88.7 +grpc-google-cloud-containeranalysis-v1:1.2.7:1.2.7 +google-cloud-containeranalysis:1.2.7:1.2.7