From e062179a9c09247f0ad2aabb127bebd484695069 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 6 Feb 2024 18:11:38 -0500 Subject: [PATCH 01/16] chore: removing Kokoro - Against Pub/Sub Lite samples from required checks (#1894) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: removing Kokoro - Against Pub/Sub Lite samples from required checks The "Kokoro - Against Pub/Sub Lite samples" has been failing for a while. * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .github/sync-repo-settings.yaml | 1 - README.md | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 46e11116d..2cd50ab00 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -14,7 +14,6 @@ branchProtectionRules: - units (8) - units (11) - 'Kokoro - Test: Integration' - - Kokoro - Against Pub/Sub Lite samples - cla/google - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' diff --git a/README.md b/README.md index 4f9b1de52..9873ea9d1 100644 --- a/README.md +++ b/README.md @@ -52,20 +52,20 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.30.0') +implementation platform('com.google.cloud:libraries-bom:26.31.0') 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.126.1' +implementation 'com.google.cloud:google-cloud-pubsub:1.126.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.126.1" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.126.2" ``` @@ -409,7 +409,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.126.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.126.2 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles From 6d6dc891c7f1e23e3ee53bea09ed9954ac3b359b Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 6 Feb 2024 18:27:23 -0500 Subject: [PATCH 02/16] ci: unmanaged dependency check (#1892) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ci: unmanaged dependency check This is is the implementation for the one I got your review in go/cloud-sdk-java-dependency-governance-design. This check will avoid accidentally adding a third-party dependency. b/320677249 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../workflows/unmanaged_dependency_check.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/unmanaged_dependency_check.yaml diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml new file mode 100644 index 000000000..62c5fa4a0 --- /dev/null +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -0,0 +1,22 @@ +on: + pull_request: +name: Unmanaged dependency check +jobs: + unmanaged_dependency_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + - name: Install modules + shell: bash + run: | + # No argument to build.sh installs the modules in local Maven + # repository + .kokoro/build.sh + - name: Unmanaged dependency check + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@unmanaged-dependencies-check-latest + with: + bom-path: google-cloud-pubsub-bom/pom.xml From a2063cf8f1f792f5ad1994bff00f367b399c0ff2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 7 Feb 2024 05:12:03 +0100 Subject: [PATCH 03/16] deps: update dependency com.google.cloud:google-cloud-core to v2.32.0 (#1885) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 038b328af..ab1e205bf 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -80,7 +80,7 @@ com.google.cloud google-cloud-core - 2.31.0 + 2.32.0 tests diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 965d9d592..c02e9627f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -79,7 +79,7 @@ com.google.cloud google-cloud-core - 2.31.0 + 2.32.0 tests diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 26215fd06..8b63238f9 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -98,7 +98,7 @@ com.google.cloud google-cloud-core - 2.31.0 + 2.32.0 tests From 7ed363ebe7d95d8ee03ccea787389941f0387e98 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 7 Feb 2024 04:24:16 +0000 Subject: [PATCH 04/16] chore: use sdk-platform-java-config to consolidate build configs (#1895) --- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- owlbot.py | 4 +++- pom.xml | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index fb5bb678f..90d9a20a0 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:22.3.3" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.24.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 59efee340..948177be8 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:22.3.3" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.24.0" } env_vars: { diff --git a/owlbot.py b/owlbot.py index 6cb015af0..1ef474bc4 100644 --- a/owlbot.py +++ b/owlbot.py @@ -1211,6 +1211,8 @@ ".github/sync-repo-settings.yaml", ".github/blunderbuss.yml", '.kokoro/requirements.in', - '.kokoro/requirements.txt' + '.kokoro/requirements.txt', + '.kokoro/presubmit/graalvm-native.cfg', + '.kokoro/presubmit/graalvm-native-17.cfg' ] ) diff --git a/pom.xml b/pom.xml index 628287c8e..764995a45 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ com.google.cloud - google-cloud-shared-config - 1.7.1 + sdk-platform-java-config + 3.24.0 @@ -61,7 +61,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.23.0 + ${google-cloud-shared-dependencies.version} pom import From b9c6b651b1494fd0d57c5830988d6abd9cf70131 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:56:19 -0500 Subject: [PATCH 05/16] chore: adjust renovate bot configs to update the sdk-platform-java-config artifact (#1921) (#1884) chore: update renovate bot configs to update the sdk-platform-java-config artifact Source-Link: https://github.com/googleapis/synthtool/commit/d7828c02a5b1aeb8dcf3aa6c55f8fdf407a0156f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:0d1bb26a1a99ae0456176bf891b8490e9aab424a5cb4e4d301d9703c4dc43b58 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 4 ++-- renovate.json | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dc05a7276..bf48c82da 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a6aa751984f1e905c3ae5a3aac78fc7b68210626ce91487dc7ff4f0a06f010cc -# created: 2024-01-22T14:14:20.913785597Z + digest: sha256:0d1bb26a1a99ae0456176bf891b8490e9aab424a5cb4e4d301d9703c4dc43b58 +# created: 2024-01-30T19:46:55.029238294Z diff --git a/renovate.json b/renovate.json index 977082821..10ded9f10 100644 --- a/renovate.json +++ b/renovate.json @@ -14,6 +14,17 @@ ".kokoro/requirements.txt", ".github/workflows/**" ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": [ + "^.kokoro/presubmit/graalvm-native.*.cfg$" + ], + "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""], + "depNameTemplate": "com.google.cloud:sdk-platform-java-config", + "datasourceTemplate": "maven" + } + ], "packageRules": [ { "packagePatterns": [ From 7d24594e5fda69abb45b77124b8be3d8589b8df2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 7 Feb 2024 20:13:09 +0100 Subject: [PATCH 06/16] chore(deps): update dependency com.google.cloud:libraries-bom to v26.31.0 (#1883) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.31.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 2 +- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9873ea9d1..f17677181 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.30.0 + 26.31.0 pom import diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index b766b6326..3a75434c4 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -30,7 +30,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.google.cloud libraries-bom - 26.30.0 + 26.31.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 8b63238f9..dec1fffa3 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -45,7 +45,7 @@ com.google.cloud libraries-bom - 26.30.0 + 26.31.0 pom import From 4ad5cc9ff805b77dbc2ebd78671a553da8239a30 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 8 Feb 2024 01:14:07 +0100 Subject: [PATCH 07/16] chore(deps): update dependency com.google.cloud:google-cloud-pubsub to v1.126.2 (#1881) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-pubsub to v1.126.2 * chore(deps): update dependency com.google.cloud:google-cloud-pubsub to v1.126.2 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 2 +- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f17677181..68423c089 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-pubsub - 1.126.1 + 1.126.2 ``` diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ab1e205bf..8a23573ba 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.126.1 + 1.126.2 From c80767f194d7eeb7d5b9338bd6431c60c7a19791 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:30:16 +0000 Subject: [PATCH 08/16] chore(main): release 1.126.3 (#1896) :robot: I have created a release *beep* *boop* --- ## [1.126.3](https://togithub.com/googleapis/java-pubsub/compare/v1.126.2...v1.126.3) (2024-02-08) ### Dependencies * Update dependency com.google.cloud:google-cloud-core to v2.32.0 ([#1885](https://togithub.com/googleapis/java-pubsub/issues/1885)) ([a2063cf](https://togithub.com/googleapis/java-pubsub/commit/a2063cf8f1f792f5ad1994bff00f367b399c0ff2)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ google-cloud-pubsub-bom/pom.xml | 8 ++++---- google-cloud-pubsub/pom.xml | 4 ++-- grpc-google-cloud-pubsub-v1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-pubsub-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a883226a..8721be429 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.126.3](https://github.com/googleapis/java-pubsub/compare/v1.126.2...v1.126.3) (2024-02-08) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-core to v2.32.0 ([#1885](https://github.com/googleapis/java-pubsub/issues/1885)) ([a2063cf](https://github.com/googleapis/java-pubsub/commit/a2063cf8f1f792f5ad1994bff00f367b399c0ff2)) + ## [1.126.2](https://github.com/googleapis/java-pubsub/compare/v1.126.1...v1.126.2) (2024-01-26) diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index b8d3fc0a3..cbf0b858c 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.126.3-SNAPSHOT + 1.126.3 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.126.3-SNAPSHOT + 1.126.3 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.108.3-SNAPSHOT + 1.108.3 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.108.3-SNAPSHOT + 1.108.3 diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 14dca02b0..650cb553f 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.126.3-SNAPSHOT + 1.126.3 jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.126.3-SNAPSHOT + 1.126.3 google-cloud-pubsub diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index 686abc578..236f1fbe5 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.108.3-SNAPSHOT + 1.108.3 grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.126.3-SNAPSHOT + 1.126.3 diff --git a/pom.xml b/pom.xml index 764995a45..321bef25a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.126.3-SNAPSHOT + 1.126.3 Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -69,17 +69,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.108.3-SNAPSHOT + 1.108.3 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.108.3-SNAPSHOT + 1.108.3 com.google.cloud google-cloud-pubsub - 1.126.3-SNAPSHOT + 1.126.3 diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index 581378af5..6e94b2ee1 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.108.3-SNAPSHOT + 1.108.3 proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.126.3-SNAPSHOT + 1.126.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c02e9627f..b1e557e8b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.126.3-SNAPSHOT + 1.126.3 diff --git a/versions.txt b/versions.txt index fc723dc08..8cce4bec8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.126.2:1.126.3-SNAPSHOT -grpc-google-cloud-pubsub-v1:1.108.2:1.108.3-SNAPSHOT -proto-google-cloud-pubsub-v1:1.108.2:1.108.3-SNAPSHOT +google-cloud-pubsub:1.126.3:1.126.3 +grpc-google-cloud-pubsub-v1:1.108.3:1.108.3 +proto-google-cloud-pubsub-v1:1.108.3:1.108.3 From a9f4a2b01fc4f58d44fb4ef13fe206ae262b582a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:44:16 +0000 Subject: [PATCH 09/16] chore(main): release 1.126.4-SNAPSHOT (#1901) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-cloud-pubsub-bom/pom.xml | 8 ++++---- google-cloud-pubsub/pom.xml | 4 ++-- grpc-google-cloud-pubsub-v1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-pubsub-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index cbf0b858c..276983e5d 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.126.3 + 1.126.4-SNAPSHOT pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.126.3 + 1.126.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.108.3 + 1.108.4-SNAPSHOT com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.108.3 + 1.108.4-SNAPSHOT diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 650cb553f..860c849af 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.126.3 + 1.126.4-SNAPSHOT jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.126.3 + 1.126.4-SNAPSHOT google-cloud-pubsub diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index 236f1fbe5..2b9af8e22 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.108.3 + 1.108.4-SNAPSHOT grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.126.3 + 1.126.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 321bef25a..8c5700e1e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.126.3 + 1.126.4-SNAPSHOT Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -69,17 +69,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.108.3 + 1.108.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.108.3 + 1.108.4-SNAPSHOT com.google.cloud google-cloud-pubsub - 1.126.3 + 1.126.4-SNAPSHOT diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index 6e94b2ee1..0ad7b2a8f 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.108.3 + 1.108.4-SNAPSHOT proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.126.3 + 1.126.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b1e557e8b..94159b432 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.126.3 + 1.126.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 8cce4bec8..a8c7ca076 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.126.3:1.126.3 -grpc-google-cloud-pubsub-v1:1.108.3:1.108.3 -proto-google-cloud-pubsub-v1:1.108.3:1.108.3 +google-cloud-pubsub:1.126.3:1.126.4-SNAPSHOT +grpc-google-cloud-pubsub-v1:1.108.3:1.108.4-SNAPSHOT +proto-google-cloud-pubsub-v1:1.108.3:1.108.4-SNAPSHOT From 38debd16301be3b0dc25a744ae2a5f08dbd9beea Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 8 Feb 2024 21:25:20 +0100 Subject: [PATCH 10/16] chore(deps): update dependency com.google.cloud:google-cloud-pubsub to v1.126.3 (#1902) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-pubsub to v1.126.3 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 8 ++++---- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 68423c089..89680132d 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-pubsub - 1.126.2 + 1.126.3 ``` @@ -59,13 +59,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.126.2' +implementation 'com.google.cloud:google-cloud-pubsub:1.126.3' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.126.2" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.126.3" ``` @@ -409,7 +409,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.126.2 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.126.3 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8a23573ba..b6169a62c 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.126.2 + 1.126.3 From 77f3c2662706dbd6104897873622b568d55e930d Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Thu, 8 Feb 2024 15:41:19 -0500 Subject: [PATCH 11/16] chore: change assignees for issues and PRs to michaelpri10 (#1899) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: change assignees for issues and PRs to michaelpri10 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .github/blunderbuss.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 44ab091e1..97998e463 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,9 +1,9 @@ # Configuration for the Blunderbuss GitHub app. For more info see # https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_issues: - - maitrimangal + - michaelpri10 assign_prs: - - maitrimangal + - michaelpri10 assign_prs_by: - labels: - samples From 22a87c67f07b55266e277f83f5ceb17d9f32f67e Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Fri, 9 Feb 2024 15:45:21 -0500 Subject: [PATCH 12/16] fix: Message ordering fix for #1889 (#1903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: change assignees for issues and PRs to michaelpri10 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: Revert PR#1807 and use a LinkedHasMap in the MessageDispatcher * fix: Make processedReceivedMessages thread-safe * fix: Only synchronize on the outstandingReceipts object in the MessageDispatcher --------- Co-authored-by: Owl Bot --- .../cloud/pubsub/v1/MessageDispatcher.java | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java index 635bc92d5..1810badd2 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -92,8 +93,8 @@ class MessageDispatcher { private final LinkedBlockingQueue pendingAcks = new LinkedBlockingQueue<>(); private final LinkedBlockingQueue pendingNacks = new LinkedBlockingQueue<>(); private final LinkedBlockingQueue pendingReceipts = new LinkedBlockingQueue<>(); - private final ConcurrentMap outstandingReceipts = - new ConcurrentHashMap(); + private final LinkedHashMap outstandingReceipts = + new LinkedHashMap(); private final AtomicInteger messageDeadlineSeconds = new AtomicInteger(); private final AtomicBoolean extendDeadline = new AtomicBoolean(true); private final Lock jobLock; @@ -397,7 +398,9 @@ void processReceivedMessages(List messages) { if (this.exactlyOnceDeliveryEnabled.get()) { // For exactly once deliveries we don't add to outstanding batch because we first // process the receipt modack. If that is successful then we process the message. - outstandingReceipts.put(message.getAckId(), new ReceiptCompleteData(outstandingMessage)); + synchronized (outstandingReceipts) { + outstandingReceipts.put(message.getAckId(), new ReceiptCompleteData(outstandingMessage)); + } } else if (pendingMessages.putIfAbsent(message.getAckId(), ackHandler) != null) { // putIfAbsent puts ackHandler if ackID isn't previously mapped, then return the // previously-mapped element. @@ -417,33 +420,36 @@ void processReceivedMessages(List messages) { } void notifyAckSuccess(AckRequestData ackRequestData) { - - if (outstandingReceipts.containsKey(ackRequestData.getAckId())) { - outstandingReceipts.get(ackRequestData.getAckId()).notifyReceiptComplete(); - List outstandingBatch = new ArrayList<>(); - - for (Iterator> it = - outstandingReceipts.entrySet().iterator(); - it.hasNext(); ) { - Map.Entry receipt = it.next(); - // If receipt is complete then add to outstandingBatch to process the batch - if (receipt.getValue().isReceiptComplete()) { - it.remove(); - if (pendingMessages.putIfAbsent( - receipt.getKey(), receipt.getValue().getOutstandingMessage().ackHandler) - == null) { - outstandingBatch.add(receipt.getValue().getOutstandingMessage()); + synchronized (outstandingReceipts) { + if (outstandingReceipts.containsKey(ackRequestData.getAckId())) { + outstandingReceipts.get(ackRequestData.getAckId()).notifyReceiptComplete(); + List outstandingBatch = new ArrayList<>(); + + for (Iterator> it = + outstandingReceipts.entrySet().iterator(); + it.hasNext(); ) { + Map.Entry receipt = it.next(); + // If receipt is complete then add to outstandingBatch to process the batch + if (receipt.getValue().isReceiptComplete()) { + it.remove(); + if (pendingMessages.putIfAbsent( + receipt.getKey(), receipt.getValue().getOutstandingMessage().ackHandler) + == null) { + outstandingBatch.add(receipt.getValue().getOutstandingMessage()); + } + } else { + break; } - } else { - break; } + processBatch(outstandingBatch); } - processBatch(outstandingBatch); } } void notifyAckFailed(AckRequestData ackRequestData) { - outstandingReceipts.remove(ackRequestData.getAckId()); + synchronized (outstandingReceipts) { + outstandingReceipts.remove(ackRequestData.getAckId()); + } } private void processBatch(List batch) { From f801667535e3483b07a4d2ba663f7d51404f8e25 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:30:00 -0500 Subject: [PATCH 13/16] chore(main): release 1.126.4 (#1905) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ google-cloud-pubsub-bom/pom.xml | 8 ++++---- google-cloud-pubsub/pom.xml | 4 ++-- grpc-google-cloud-pubsub-v1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-pubsub-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8721be429..92946f184 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.126.4](https://github.com/googleapis/java-pubsub/compare/v1.126.3...v1.126.4) (2024-02-09) + + +### Bug Fixes + +* Message ordering fix for [#1889](https://github.com/googleapis/java-pubsub/issues/1889) ([#1903](https://github.com/googleapis/java-pubsub/issues/1903)) ([22a87c6](https://github.com/googleapis/java-pubsub/commit/22a87c67f07b55266e277f83f5ceb17d9f32f67e)) + ## [1.126.3](https://github.com/googleapis/java-pubsub/compare/v1.126.2...v1.126.3) (2024-02-08) diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index 276983e5d..795bf000c 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.126.4-SNAPSHOT + 1.126.4 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.126.4-SNAPSHOT + 1.126.4 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.108.4-SNAPSHOT + 1.108.4 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.108.4-SNAPSHOT + 1.108.4 diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 860c849af..cb705395d 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.126.4-SNAPSHOT + 1.126.4 jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.126.4-SNAPSHOT + 1.126.4 google-cloud-pubsub diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index 2b9af8e22..ab59fe1ad 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.108.4-SNAPSHOT + 1.108.4 grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.126.4-SNAPSHOT + 1.126.4 diff --git a/pom.xml b/pom.xml index 8c5700e1e..6de969e6a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.126.4-SNAPSHOT + 1.126.4 Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -69,17 +69,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.108.4-SNAPSHOT + 1.108.4 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.108.4-SNAPSHOT + 1.108.4 com.google.cloud google-cloud-pubsub - 1.126.4-SNAPSHOT + 1.126.4 diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index 0ad7b2a8f..e06710a62 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.108.4-SNAPSHOT + 1.108.4 proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.126.4-SNAPSHOT + 1.126.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 94159b432..adcd70028 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.126.4-SNAPSHOT + 1.126.4 diff --git a/versions.txt b/versions.txt index a8c7ca076..451bc8f07 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.126.3:1.126.4-SNAPSHOT -grpc-google-cloud-pubsub-v1:1.108.3:1.108.4-SNAPSHOT -proto-google-cloud-pubsub-v1:1.108.3:1.108.4-SNAPSHOT +google-cloud-pubsub:1.126.4:1.126.4 +grpc-google-cloud-pubsub-v1:1.108.4:1.108.4 +proto-google-cloud-pubsub-v1:1.108.4:1.108.4 From 5017789c996246ece0c5428c68c9c6681b760bca Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 9 Feb 2024 22:32:42 +0100 Subject: [PATCH 14/16] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.0 (#1888) --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 3a75434c4..29826de5f 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -134,7 +134,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.graalvm.buildtools native-maven-plugin - 0.9.28 + 0.10.0 true pubsub.NativeImagePubSubSample From 231899a68ec0b893edecb9497bfc47253c778987 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 9 Feb 2024 22:35:10 +0100 Subject: [PATCH 15/16] test(deps): update dependency com.google.truth:truth to v1.4.0 (#1890) --- pom.xml | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/native-image-sample/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 6de969e6a..227cd7d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ com.google.truth truth - 1.3.0 + 1.4.0 test diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index b6169a62c..e40c9caaa 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -69,7 +69,7 @@ com.google.truth truth - 1.3.0 + 1.4.0 test diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 29826de5f..5a064d826 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -56,7 +56,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.google.truth truth - 1.3.0 + 1.4.0 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index adcd70028..52c09eace 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -73,7 +73,7 @@ com.google.truth truth - 1.3.0 + 1.4.0 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index dec1fffa3..34c2c4bde 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -92,7 +92,7 @@ com.google.truth truth - 1.3.0 + 1.4.0 test From 231ba51c8bd2e6a8f3e0171626d35761bd07ae19 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 9 Feb 2024 22:35:34 +0100 Subject: [PATCH 16/16] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.10.2 (#1891) --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 5a064d826..e114bce2d 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -107,7 +107,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.junit.vintage junit-vintage-engine - 5.10.1 + 5.10.2 test