diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 8c2111596..44d931506 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-pubsub.git", - "sha": "312966d58c494864d57821ed1a75c84fd3de1aab" + "sha": "6ba803b3c62e6951297d09f4a749a9094a0a7d24" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0a071b3460344886297a304253bf924aa68ddb7e" + "sha": "ff6b759fcb58f216f62b48d5be0bb85fafbc3bb2" } } ] diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 88a113efd..9d2d471ee 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/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a73..1f55b7702 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 16126d2eb..8a1033843 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 6f31c6eb5..793892d2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +### [1.112.2](https://www.github.com/googleapis/java-pubsub/compare/v1.112.1...v1.112.2) (2021-04-24) + + +### Bug Fixes + +* release scripts from issuing overlapping phases ([#610](https://www.github.com/googleapis/java-pubsub/issues/610)) ([70246e8](https://www.github.com/googleapis/java-pubsub/commit/70246e8fd24c7e85b0384d99bd3895094383ff5e)) +* typo ([#603](https://www.github.com/googleapis/java-pubsub/issues/603)) ([60b087d](https://www.github.com/googleapis/java-pubsub/commit/60b087d2e2afbadaff5dd0a3b946d46b61acbf95)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#614](https://www.github.com/googleapis/java-pubsub/issues/614)) ([61e2ea1](https://www.github.com/googleapis/java-pubsub/commit/61e2ea112a4d44219adb20f087e7847114be4261)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#626](https://www.github.com/googleapis/java-pubsub/issues/626)) ([a9884a9](https://www.github.com/googleapis/java-pubsub/commit/a9884a9beede67ce90616be2f1bdd7da1aa6f867)) +* update dependency org.easymock:easymock to v4.3 ([#612](https://www.github.com/googleapis/java-pubsub/issues/612)) ([b08e816](https://www.github.com/googleapis/java-pubsub/commit/b08e81604341381543b13f68bb0695c55d0a7575)) + ### [1.112.1](https://www.github.com/googleapis/java-pubsub/compare/v1.112.0...v1.112.1) (2021-04-12) diff --git a/README.md b/README.md index 484748b9a..a14216920 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 - 20.0.0 + 20.1.0 pom import @@ -40,25 +40,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-pubsub - 1.112.0 + 1.112.1 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.0.0') +implementation platform('com.google.cloud:libraries-bom:20.1.0') compile 'com.google.cloud:google-cloud-pubsub' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-pubsub:1.112.0' +compile 'com.google.cloud:google-cloud-pubsub:1.112.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.112.0" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.112.1" ``` ## Authentication diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index 250f6d6ae..b69d0a6f6 100644 --- a/google-cloud-pubsub-bom/pom.xml +++ b/google-cloud-pubsub-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-pubsub-bom - 1.112.1 + 1.112.2 pom com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 Google Cloud pubsub BOM @@ -64,17 +64,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.94.1 + 1.94.2 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.94.1 + 1.94.2 com.google.cloud google-cloud-pubsub - 1.112.1 + 1.112.2 diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index fc5a9ad2a..f0d4768c7 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub - 1.112.1 + 1.112.2 jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.112.1 + 1.112.2 google-cloud-pubsub diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index fb27abbf0..5e772e9b7 100644 --- a/grpc-google-cloud-pubsub-v1/pom.xml +++ b/grpc-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.94.1 + 1.94.2 grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.112.1 + 1.112.2 diff --git a/pom.xml b/pom.xml index 4d6afbd0a..76906291b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.112.1 + 1.112.2 Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 @@ -70,7 +70,7 @@ com.google.cloud google-cloud-shared-dependencies - 0.21.0 + 1.0.0 pom import @@ -78,17 +78,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.94.1 + 1.94.2 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.94.1 + 1.94.2 com.google.cloud google-cloud-pubsub - 1.112.1 + 1.112.2 @@ -107,7 +107,7 @@ org.easymock easymock - 4.2 + 4.3 test diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index a5fc1bee0..79d0069ad 100644 --- a/proto-google-cloud-pubsub-v1/pom.xml +++ b/proto-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.94.1 + 1.94.2 proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.112.1 + 1.112.2 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8e985a22c..564841647 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -44,7 +44,7 @@ com.google.cloud google-cloud-pubsub - 1.112.0 + 1.112.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c10c9320e..570e83f43 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.112.1 + 1.112.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9d0fa5478..9d0068805 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -45,7 +45,7 @@ com.google.cloud libraries-bom - 20.0.0 + 20.1.0 pom import diff --git a/synth.metadata b/synth.metadata index dd4c11fda..72a860efc 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-pubsub.git", - "sha": "8adde2d6741c8bc264f00e34255368ef527aa9ce" + "sha": "861e236ea07a26f641f94de82ad781ad9322bfdc" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015" + "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" } } ], @@ -45,6 +45,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 aafd7951a..a64685291 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-pubsub-v1:1.94.1:1.94.1 -grpc-google-cloud-pubsub-v1:1.94.1:1.94.1 -google-cloud-pubsub:1.112.1:1.112.1 \ No newline at end of file +proto-google-cloud-pubsub-v1:1.94.2:1.94.2 +grpc-google-cloud-pubsub-v1:1.94.2:1.94.2 +google-cloud-pubsub:1.112.2:1.112.2 \ No newline at end of file