diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 1443b8b5..c8ef9f05 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-webrisk.git", - "sha": "d0b0d1983d5e916254cf737a30bb7394f73239a8" + "sha": "5958b55f34126cc50769acc35472323b67fbbec2" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "60fc32cc950c20cfdd774b846a4a7dc5d1e4d0ef" + "sha": "ff6b759fcb58f216f62b48d5be0bb85fafbc3bb2" } } ] diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fe7c4968..0a06bac9 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0fb8c843..59d2aafc 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a7..1f55b770 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2e..8a103384 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 39b35cd6..0ad5538c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [1.1.13](https://www.github.com/googleapis/java-webrisk/compare/v1.1.12...v1.1.13) (2021-04-24) + + +### Bug Fixes + +* release scripts from issuing overlapping phases ([#406](https://www.github.com/googleapis/java-webrisk/issues/406)) ([e39069e](https://www.github.com/googleapis/java-webrisk/commit/e39069e1fc4b8c951126be2e4ec90c651caed6d5)) +* typo ([#403](https://www.github.com/googleapis/java-webrisk/issues/403)) ([4a3f583](https://www.github.com/googleapis/java-webrisk/commit/4a3f58318eedd048f18ce5f75e87f5c50b1f5647)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#409](https://www.github.com/googleapis/java-webrisk/issues/409)) ([92390d5](https://www.github.com/googleapis/java-webrisk/commit/92390d56936f695a199ea825323f3d1535dafe8a)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#417](https://www.github.com/googleapis/java-webrisk/issues/417)) ([7f798dd](https://www.github.com/googleapis/java-webrisk/commit/7f798dd570cccb2cc1681bc8ebd1ab610dd5b2cd)) + ### [1.1.12](https://www.github.com/googleapis/java-webrisk/compare/v1.1.11...v1.1.12) (2021-04-09) diff --git a/README.md b/README.md index 93cefdc3..6894a09e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 19.2.1 + 20.1.0 pom import @@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-webrisk - 1.1.11 + 1.1.12 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:19.2.1') +implementation platform('com.google.cloud:libraries-bom:20.1.0') compile 'com.google.cloud:google-cloud-webrisk' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-webrisk:1.1.11' +compile 'com.google.cloud:google-cloud-webrisk:1.1.12' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-webrisk" % "1.1.11" +libraryDependencies += "com.google.cloud" % "google-cloud-webrisk" % "1.1.12" ``` ## Authentication diff --git a/google-cloud-webrisk-bom/pom.xml b/google-cloud-webrisk-bom/pom.xml index 836c3eea..bb9dd0a1 100644 --- a/google-cloud-webrisk-bom/pom.xml +++ b/google-cloud-webrisk-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-webrisk-bom - 1.1.12 + 1.1.13 pom com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 Google Cloud webrisk BOM @@ -63,27 +63,27 @@ com.google.cloud google-cloud-webrisk - 1.1.12 + 1.1.13 com.google.api.grpc grpc-google-cloud-webrisk-v1 - 1.1.12 + 1.1.13 com.google.api.grpc grpc-google-cloud-webrisk-v1beta1 - 0.35.12 + 0.35.13 com.google.api.grpc proto-google-cloud-webrisk-v1 - 1.1.12 + 1.1.13 com.google.api.grpc proto-google-cloud-webrisk-v1beta1 - 0.35.12 + 0.35.13 diff --git a/google-cloud-webrisk/pom.xml b/google-cloud-webrisk/pom.xml index 27e8e8dc..1d290169 100644 --- a/google-cloud-webrisk/pom.xml +++ b/google-cloud-webrisk/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-webrisk - 1.1.12 + 1.1.13 jar Google Cloud Web Risk https://github.com/googleapis/java-webrisk @@ -11,7 +11,7 @@ com.google.cloud google-cloud-webrisk-parent - 1.1.12 + 1.1.13 google-cloud-webrisk diff --git a/grpc-google-cloud-webrisk-v1/pom.xml b/grpc-google-cloud-webrisk-v1/pom.xml index a545301b..a404742a 100644 --- a/grpc-google-cloud-webrisk-v1/pom.xml +++ b/grpc-google-cloud-webrisk-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-webrisk-v1 - 1.1.12 + 1.1.13 grpc-google-cloud-webrisk-v1 GRPC library for grpc-google-cloud-webrisk-v1 com.google.cloud google-cloud-webrisk-parent - 1.1.12 + 1.1.13 diff --git a/grpc-google-cloud-webrisk-v1beta1/pom.xml b/grpc-google-cloud-webrisk-v1beta1/pom.xml index 85e28254..5fe7845f 100644 --- a/grpc-google-cloud-webrisk-v1beta1/pom.xml +++ b/grpc-google-cloud-webrisk-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-webrisk-v1beta1 - 0.35.12 + 0.35.13 grpc-google-cloud-webrisk-v1beta1 GRPC library for grpc-google-cloud-webrisk-v1beta1 com.google.cloud google-cloud-webrisk-parent - 1.1.12 + 1.1.13 diff --git a/pom.xml b/pom.xml index 22f3111b..7fc09f60 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-webrisk-parent pom - 1.1.12 + 1.1.13 Google Cloud Web Risk Parent https://github.com/googleapis/java-webrisk @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 @@ -70,33 +70,33 @@ com.google.api.grpc proto-google-cloud-webrisk-v1 - 1.1.12 + 1.1.13 com.google.api.grpc proto-google-cloud-webrisk-v1beta1 - 0.35.12 + 0.35.13 com.google.api.grpc grpc-google-cloud-webrisk-v1 - 1.1.12 + 1.1.13 com.google.api.grpc grpc-google-cloud-webrisk-v1beta1 - 0.35.12 + 0.35.13 com.google.cloud google-cloud-webrisk - 1.1.12 + 1.1.13 com.google.cloud google-cloud-shared-dependencies - 0.21.0 + 1.0.0 pom import diff --git a/proto-google-cloud-webrisk-v1/pom.xml b/proto-google-cloud-webrisk-v1/pom.xml index 5a245fa6..63e382c3 100644 --- a/proto-google-cloud-webrisk-v1/pom.xml +++ b/proto-google-cloud-webrisk-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-webrisk-v1 - 1.1.12 + 1.1.13 proto-google-cloud-webrisk-v1 PROTO library for proto-google-cloud-webrisk-v1 com.google.cloud google-cloud-webrisk-parent - 1.1.12 + 1.1.13 diff --git a/proto-google-cloud-webrisk-v1beta1/pom.xml b/proto-google-cloud-webrisk-v1beta1/pom.xml index e6501cf6..e1d7ce47 100644 --- a/proto-google-cloud-webrisk-v1beta1/pom.xml +++ b/proto-google-cloud-webrisk-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-webrisk-v1beta1 - 0.35.12 + 0.35.13 proto-google-cloud-webrisk-v1beta1 PROTO library for proto-google-cloud-webrisk-v1beta1 com.google.cloud google-cloud-webrisk-parent - 1.1.12 + 1.1.13 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index b8d2f78c..1aaef0f9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-webrisk - 1.1.11 + 1.1.12 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index cd04050b..84436e37 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-webrisk - 1.1.11 + 1.1.12 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 4cf8cc66..7a9da1a9 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 19.2.1 + 20.1.0 pom import diff --git a/synth.metadata b/synth.metadata index b1545a4a..ab5d4113 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-webrisk.git", - "sha": "1ea72c8a00004f2afd7a9102c73983486e42c30a" + "sha": "be77f4afc6d6c0d7839693733d85055fc538fb6c" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098" + "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" } } ], @@ -62,6 +62,7 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", diff --git a/versions.txt b/versions.txt index 650b3d5a..bc22848d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-webrisk-v1:1.1.12:1.1.12 -proto-google-cloud-webrisk-v1beta1:0.35.12:0.35.12 -grpc-google-cloud-webrisk-v1:1.1.12:1.1.12 -grpc-google-cloud-webrisk-v1beta1:0.35.12:0.35.12 -google-cloud-webrisk:1.1.12:1.1.12 +proto-google-cloud-webrisk-v1:1.1.13:1.1.13 +proto-google-cloud-webrisk-v1beta1:0.35.13:0.35.13 +grpc-google-cloud-webrisk-v1:1.1.13:1.1.13 +grpc-google-cloud-webrisk-v1beta1:0.35.13:0.35.13 +google-cloud-webrisk:1.1.13:1.1.13