diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 202e7084c..4ca0036da 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a57d2ea6d1a77aa96c17ad0850b779ec6295f88b6c1da3d214b2095d140a2066 - + digest: sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index a3f7fb9d4..e20330c3c 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 4c7225ec9..0fd6ba2fa 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0" } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index d3c708a6e..83bff2d07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.122.2](https://github.com/googleapis/java-pubsub/compare/v1.122.1...v1.122.2) (2022-12-15) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-core to v2.9.0 ([#1435](https://github.com/googleapis/java-pubsub/issues/1435)) ([786c493](https://github.com/googleapis/java-pubsub/commit/786c49303bc196e548b00ef0cf39d766e8fd71a8)) +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.0 ([#1436](https://github.com/googleapis/java-pubsub/issues/1436)) ([a40337b](https://github.com/googleapis/java-pubsub/commit/a40337b493454d20a12f70b7817de7b0f2584b84)) + ## [1.122.1](https://github.com/googleapis/java-pubsub/compare/v1.122.0...v1.122.1) (2022-12-02) diff --git a/README.md b/README.md index 1b3a3750d..ff71d5c59 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-pubsub - 1.121.1 + 1.122.1 ``` @@ -58,13 +58,13 @@ implementation 'com.google.cloud:google-cloud-pubsub' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-pubsub:1.121.1' +implementation 'com.google.cloud:google-cloud-pubsub:1.122.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.121.1" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.122.1" ``` ## Authentication diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index 9b5ab775c..9af4bea7d 100644 --- a/google-cloud-pubsub-bom/pom.xml +++ b/google-cloud-pubsub-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub-bom - 1.122.1 + 1.122.2 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.122.1 + 1.122.2 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.104.1 + 1.104.2 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.104.1 + 1.104.2 diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 3652aa6c5..484360163 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.122.1 + 1.122.2 jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.122.1 + 1.122.2 google-cloud-pubsub diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java index d8f026fee..cf067e2da 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java @@ -258,6 +258,7 @@ public int compareTo(Delayed o) { @Override public boolean cancel(boolean mayInterruptIfRunning) { synchronized (this) { + future.cancel(mayInterruptIfRunning); cancelled.set(true); return !done.get(); } diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index 17c1cb162..e9798394b 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.104.1 + 1.104.2 grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.122.1 + 1.122.2 diff --git a/pom.xml b/pom.xml index 92b00facc..d17770027 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.122.1 + 1.122.2 Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -61,7 +61,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.6 + 3.1.0 pom import @@ -69,24 +69,24 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.104.1 + 1.104.2 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.104.1 + 1.104.2 com.google.cloud google-cloud-pubsub - 1.122.1 + 1.122.2 org.mockito mockito-core - 4.9.0 + 4.10.0 test diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index 7d9ce74d0..5d49bb4b7 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.104.1 + 1.104.2 proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.122.1 + 1.122.2 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index c5a707f41..edb7988cf 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.121.1 + 1.122.1 @@ -80,7 +80,7 @@ com.google.cloud google-cloud-core - 2.8.28 + 2.9.0 tests diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 989ae2006..f66d336fd 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.122.1 + 1.122.2 @@ -79,7 +79,7 @@ com.google.cloud google-cloud-core - 2.8.28 + 2.9.0 tests diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index b6e0de24b..5b4be2c27 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -94,7 +94,7 @@ com.google.cloud google-cloud-core - 2.8.28 + 2.9.0 tests diff --git a/versions.txt b/versions.txt index 2dde6d58d..e8284f061 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.122.1:1.122.1 -grpc-google-cloud-pubsub-v1:1.104.1:1.104.1 -proto-google-cloud-pubsub-v1:1.104.1:1.104.1 +google-cloud-pubsub:1.122.2:1.122.2 +grpc-google-cloud-pubsub-v1:1.104.2:1.104.2 +proto-google-cloud-pubsub-v1:1.104.2:1.104.2