diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml new file mode 100644 index 000000000..1a23ea42b --- /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/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index e2d841d6c..7513acaeb 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 bc1554aec..2b6cdbc97 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/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml index d4d367cfc..6844407b4 100644 --- a/.github/workflows/formatting.yaml +++ b/.github/workflows/formatting.yaml @@ -18,7 +18,7 @@ jobs: with: java-version: 11 - run: "mvn com.coveo:fmt-maven-plugin:format" - - uses: googleapis/code-suggester@v1.8.0 + - uses: googleapis/code-suggester@v1 with: command: review pull_number: ${{ github.event.pull_request.number }} diff --git a/.kokoro/common.sh b/.kokoro/common.sh index a8d0ea04d..ace89f45a 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/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index a2aa6c12c..865d8bbd9 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -38,8 +38,8 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -q -DskipTests=true -NAME=google-cloud-securitycenter -VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) +export NAME=google-cloud-securitycenter +export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs mvn site -B -q @@ -59,7 +59,8 @@ python3 -m docuploader upload . \ popd -# V2 +# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. + mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" pushd target/devsite/reference diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 3c482cbc5..16126d2eb 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 9c27f6bd9..572bdd9d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.3.3](https://www.github.com/googleapis/java-securitycenter/compare/v1.3.2...v1.3.3) (2020-12-02) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#317](https://www.github.com/googleapis/java-securitycenter/issues/317)) ([5749635](https://www.github.com/googleapis/java-securitycenter/commit/574963527d22387443bcb3f38f968a88f3e26941)) + ### [1.3.2](https://www.github.com/googleapis/java-securitycenter/compare/v1.3.1...v1.3.2) (2020-11-12) diff --git a/google-cloud-securitycenter-bom/pom.xml b/google-cloud-securitycenter-bom/pom.xml index e6bbb17df..8c53ae100 100644 --- a/google-cloud-securitycenter-bom/pom.xml +++ b/google-cloud-securitycenter-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-securitycenter-bom - 1.3.2 + 1.3.3 pom com.google.cloud @@ -64,37 +64,37 @@ com.google.api.grpc grpc-google-cloud-securitycenter-v1 - 1.3.2 + 1.3.3 com.google.api.grpc proto-google-cloud-securitycenter-v1 - 1.3.2 + 1.3.3 com.google.cloud google-cloud-securitycenter - 1.3.2 + 1.3.3 com.google.api.grpc proto-google-cloud-securitycenter-v1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc grpc-google-cloud-securitycenter-v1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc proto-google-cloud-securitycenter-v1p1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc grpc-google-cloud-securitycenter-v1p1beta1 - 0.91.2 + 0.91.3 diff --git a/google-cloud-securitycenter/pom.xml b/google-cloud-securitycenter/pom.xml index 52d370275..547cc8c52 100644 --- a/google-cloud-securitycenter/pom.xml +++ b/google-cloud-securitycenter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-securitycenter - 1.3.2 + 1.3.3 jar Google Cloud Security Command Center https://github.com/googleapis/java-securitycenter @@ -11,7 +11,7 @@ com.google.cloud google-cloud-securitycenter-parent - 1.3.2 + 1.3.3 google-cloud-securitycenter diff --git a/grpc-google-cloud-securitycenter-v1/pom.xml b/grpc-google-cloud-securitycenter-v1/pom.xml index f8f5e9176..53b8a6160 100644 --- a/grpc-google-cloud-securitycenter-v1/pom.xml +++ b/grpc-google-cloud-securitycenter-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-securitycenter-v1 - 1.3.2 + 1.3.3 grpc-google-cloud-securitycenter-v1 GRPC library for grpc-google-cloud-securitycenter-v1 com.google.cloud google-cloud-securitycenter-parent - 1.3.2 + 1.3.3 diff --git a/grpc-google-cloud-securitycenter-v1beta1/pom.xml b/grpc-google-cloud-securitycenter-v1beta1/pom.xml index 1fc6b9aee..1cafa294b 100644 --- a/grpc-google-cloud-securitycenter-v1beta1/pom.xml +++ b/grpc-google-cloud-securitycenter-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-securitycenter-v1beta1 - 0.91.2 + 0.91.3 grpc-google-cloud-securitycenter-v1beta1 GRPC library for grpc-google-cloud-securitycenter-v1beta1 com.google.cloud google-cloud-securitycenter-parent - 1.3.2 + 1.3.3 diff --git a/grpc-google-cloud-securitycenter-v1p1beta1/pom.xml b/grpc-google-cloud-securitycenter-v1p1beta1/pom.xml index 9eb7b64aa..fe253157f 100644 --- a/grpc-google-cloud-securitycenter-v1p1beta1/pom.xml +++ b/grpc-google-cloud-securitycenter-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-securitycenter-v1p1beta1 - 0.91.2 + 0.91.3 grpc-google-cloud-securitycenter-v1p1beta1 GRPC library for grpc-google-cloud-securitycenter-v1p1beta1 com.google.cloud google-cloud-securitycenter-parent - 1.3.2 + 1.3.3 diff --git a/pom.xml b/pom.xml index fe9a7e7a9..1955f4dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-securitycenter-parent pom - 1.3.2 + 1.3.3 Google Cloud Security Command Center Parent https://github.com/googleapis/java-securitycenter @@ -70,43 +70,43 @@ com.google.api.grpc proto-google-cloud-securitycenter-v1 - 1.3.2 + 1.3.3 com.google.api.grpc proto-google-cloud-securitycenter-v1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc proto-google-cloud-securitycenter-v1p1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc grpc-google-cloud-securitycenter-v1 - 1.3.2 + 1.3.3 com.google.api.grpc grpc-google-cloud-securitycenter-v1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc grpc-google-cloud-securitycenter-v1p1beta1 - 0.91.2 + 0.91.3 com.google.cloud google-cloud-securitycenter - 1.3.2 + 1.3.3 com.google.cloud google-cloud-shared-dependencies - 0.15.0 + 0.16.0 pom import diff --git a/proto-google-cloud-securitycenter-v1/pom.xml b/proto-google-cloud-securitycenter-v1/pom.xml index a86c63b3f..b00489f24 100644 --- a/proto-google-cloud-securitycenter-v1/pom.xml +++ b/proto-google-cloud-securitycenter-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-securitycenter-v1 - 1.3.2 + 1.3.3 proto-google-cloud-securitycenter-v1 PROTO library for proto-google-cloud-securitycenter-v1 com.google.cloud google-cloud-securitycenter-parent - 1.3.2 + 1.3.3 diff --git a/proto-google-cloud-securitycenter-v1beta1/pom.xml b/proto-google-cloud-securitycenter-v1beta1/pom.xml index f567f505f..2cfc1c0be 100644 --- a/proto-google-cloud-securitycenter-v1beta1/pom.xml +++ b/proto-google-cloud-securitycenter-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-securitycenter-v1beta1 - 0.91.2 + 0.91.3 proto-google-cloud-securitycenter-v1beta1 PROTO library for proto-google-cloud-securitycenter-v1beta1 com.google.cloud google-cloud-securitycenter-parent - 1.3.2 + 1.3.3 diff --git a/proto-google-cloud-securitycenter-v1p1beta1/pom.xml b/proto-google-cloud-securitycenter-v1p1beta1/pom.xml index 433a09d9c..53b5e686c 100644 --- a/proto-google-cloud-securitycenter-v1p1beta1/pom.xml +++ b/proto-google-cloud-securitycenter-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-securitycenter-v1p1beta1 - 0.91.2 + 0.91.3 proto-google-cloud-securitycenter-v1p1beta1 PROTO library for proto-google-cloud-securitycenter-v1p1beta1 com.google.cloud google-cloud-securitycenter-parent - 1.3.2 + 1.3.3 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index cdb6a53cc..82a76da80 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-securitycenter - 1.3.1 + 1.3.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c9f8de969..86e6874a5 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-securitycenter - 1.3.1 + 1.3.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index adbfc6d77..523f1e9b5 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 656e11780..c085cb007 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-securitycenter.git", - "sha": "a22535b2789fc401caaeb78095b9a920f1e7052e" + "sha": "574963527d22387443bcb3f38f968a88f3e26941" } }, { @@ -35,7 +35,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279" + "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928" } } ], @@ -74,6 +74,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 a291092f2..f3719fc3b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-securitycenter-v1:1.3.2:1.3.2 -proto-google-cloud-securitycenter-v1beta1:0.91.2:0.91.2 -proto-google-cloud-securitycenter-v1p1beta1:0.91.2:0.91.2 -grpc-google-cloud-securitycenter-v1:1.3.2:1.3.2 -grpc-google-cloud-securitycenter-v1beta1:0.91.2:0.91.2 -grpc-google-cloud-securitycenter-v1p1beta1:0.91.2:0.91.2 -google-cloud-securitycenter:1.3.2:1.3.2 \ No newline at end of file +proto-google-cloud-securitycenter-v1:1.3.3:1.3.3 +proto-google-cloud-securitycenter-v1beta1:0.91.3:0.91.3 +proto-google-cloud-securitycenter-v1p1beta1:0.91.3:0.91.3 +grpc-google-cloud-securitycenter-v1:1.3.3:1.3.3 +grpc-google-cloud-securitycenter-v1beta1:0.91.3:0.91.3 +grpc-google-cloud-securitycenter-v1p1beta1:0.91.3:0.91.3 +google-cloud-securitycenter:1.3.3:1.3.3 \ No newline at end of file