From baba2ffa64cf04c2a148b84d73af1571b97a32d0 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Tue, 6 Feb 2024 20:46:26 -0500 Subject: [PATCH 1/3] chore: use sdk-platform-java-config to consolidate build configs --- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- google-cloud-pubsublite-bom/pom.xml | 4 ++-- pom.xml | 6 +++--- 4 files changed, 7 insertions(+), 7 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/google-cloud-pubsublite-bom/pom.xml b/google-cloud-pubsublite-bom/pom.xml index 4b840d9c9..bc6374a25 100644 --- a/google-cloud-pubsublite-bom/pom.xml +++ b/google-cloud-pubsublite-bom/pom.xml @@ -7,8 +7,8 @@ pom com.google.cloud - google-cloud-shared-config - 1.7.1 + sdk-platform-java-config + 3.24.0 Google Cloud pubsublite BOM diff --git a/pom.xml b/pom.xml index 146e25338..3fed36a8f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ com.google.cloud - google-cloud-shared-config - 1.7.1 + sdk-platform-java-config + 3.24.0 4.0.0 com.google.cloud @@ -18,7 +18,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.23.0 + ${google-cloud-shared-dependencies.version} pom import From 4f70dc029beb4836d9f3ad7db728bbfd9397b578 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Tue, 6 Feb 2024 20:47:41 -0500 Subject: [PATCH 2/3] exclude .kokoro graalvm cfgs from owlbot --- owlbot.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/owlbot.py b/owlbot.py index ca85ede4a..92ab341e3 100644 --- a/owlbot.py +++ b/owlbot.py @@ -26,6 +26,8 @@ ".kokoro/*/samples.cfg", "samples/install-without-bom/*", ".github/workflows/samples.yaml", - ".github/CODEOWNERS" + ".github/CODEOWNERS", + ".kokoro/presubmit/graalvm-native.cfg", + ".kokoro/presubmit/graalvm-native-17.cfg" ] ) From fabbcb37b16957e669e13501d0580ef0368bea05 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 7 Feb 2024 01:51:12 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e27cd1fb2..23eb9d989 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,13 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-pubsublite:1.12.20' +implementation 'com.google.cloud:google-cloud-pubsublite:1.12.21' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsublite" % "1.12.20" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsublite" % "1.12.21" ``` @@ -483,7 +483,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-pubsublite/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-pubsublite.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsublite/1.12.20 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsublite/1.12.21 [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