From 271e35aa050494ea3f67938ab199ebb6e1eea5ae Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 26 Aug 2025 14:07:07 -0400 Subject: [PATCH 1/4] chore: Test with Protobuf-Java v4.32 [no need to review] --- .kokoro/build.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 110835b464f..da9e3642ffd 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -92,6 +92,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -107,6 +108,7 @@ integration) integration-directpath-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -122,6 +124,7 @@ integration-directpath-enabled) integration-multiplexed-sessions-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -137,6 +140,7 @@ integration-multiplexed-sessions-enabled) integration-cloud-devel) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -153,6 +157,7 @@ integration-cloud-devel) integration-cloud-devel-directpath-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -169,6 +174,7 @@ integration-cloud-devel-directpath-enabled) integration-cloud-staging|integration-cloud-staging-directpath-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -184,12 +190,14 @@ integration-cloud-staging|integration-cloud-staging-directpath-enabled) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests + mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests \ + -Dprotobuf.version=4.32.0 RETURN_CODE=$? ;; graalvm17) # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests + mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests \ + -Dprotobuf.version=4.32.0 RETURN_CODE=$? ;; slowtests) From 1229812c41ede84c21aae664c6375e09efd8d62f Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 24 Sep 2025 11:35:36 -0400 Subject: [PATCH 2/4] chore: Update to Protobuf 4.32.1 --- .kokoro/build.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index da9e3642ffd..c51c257a5be 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -92,7 +92,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -108,7 +108,7 @@ integration) integration-directpath-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -124,7 +124,7 @@ integration-directpath-enabled) integration-multiplexed-sessions-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -140,7 +140,7 @@ integration-multiplexed-sessions-enabled) integration-cloud-devel) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -157,7 +157,7 @@ integration-cloud-devel) integration-cloud-devel-directpath-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -174,7 +174,7 @@ integration-cloud-devel-directpath-enabled) integration-cloud-staging|integration-cloud-staging-directpath-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ @@ -191,13 +191,13 @@ integration-cloud-staging|integration-cloud-staging-directpath-enabled) graalvm) # Run Unit and Integration Tests with Native Image mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests \ - -Dprotobuf.version=4.32.0 + -Dprotobuf.version=4.32.1 RETURN_CODE=$? ;; graalvm17) # Run Unit and Integration Tests with Native Image mvn test -Pnative -Penable-integration-tests -Dspanner.gce.config.project_id=gcloud-devel -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests \ - -Dprotobuf.version=4.32.0 + -Dprotobuf.version=4.32.1 RETURN_CODE=$? ;; slowtests) From 14f54d4375a7c195c00a64f37b80cc6e029d5d21 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Thu, 9 Oct 2025 03:30:56 +0000 Subject: [PATCH 3/4] chore: generate libraries at Thu Oct 9 03:28:20 UTC 2025 --- .github/workflows/update_generation_config.yaml | 2 +- README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml index 59e39834dd0..a7e14bb483c 100644 --- a/.github/workflows/update_generation_config.yaml +++ b/.github/workflows/update_generation_config.yaml @@ -26,7 +26,7 @@ jobs: # the branch into which the pull request is merged base_branch: main steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} diff --git a/README.md b/README.md index 6fc3af24e73..09bdb791d8a 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.68.0 + 26.69.0 pom import @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-spanner' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-spanner:6.101.1' +implementation 'com.google.cloud:google-cloud-spanner:6.102.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.101.1" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.102.0" ``` ## Authentication @@ -731,7 +731,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-spanner/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-spanner.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.101.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.102.0 [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 b086d2250190c2ad2b800c0ea854d0497aa45649 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Fri, 10 Oct 2025 03:30:57 +0000 Subject: [PATCH 4/4] chore: generate libraries at Fri Oct 10 03:28:21 UTC 2025 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09bdb791d8a..0aa66b78751 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.69.0 + 26.70.0 pom import