From d9b0706b0a112adb3dbc4da278f4c252b83b66fd Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 26 Aug 2025 14:09:24 -0400 Subject: [PATCH 1/3] chore: Test with Protobuf-Java v4.32 [no need to review] --- .kokoro/build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index e1b04b4fd..f3f82b46d 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -72,6 +72,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -83,6 +84,7 @@ integration) integration-cloud-devel) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -97,6 +99,7 @@ integration-cloud-devel) integration-cloud-staging) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -110,13 +113,15 @@ integration-cloud-staging) ;; graalvm) # Run Unit and Integration Tests with Native Image. - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" \ + -Dprotobuf.version=4.32.0 RETURN_CODE=$? ;; graalvmA) # Run Unit and Integration Tests with Native Image A. - NATIVE_IMAGE_OPTIONS="--strict-image-heap" mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" + NATIVE_IMAGE_OPTIONS="--strict-image-heap" mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" \ + -Dprotobuf.version=4.32.0 RETURN_CODE=$? ;; samples) From c27c94b482f1f9e8ca06b41dcaa61a7ccc535d9e Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 24 Sep 2025 11:36:34 -0400 Subject: [PATCH 2/3] chore: Update to Protobuf 4.32.1 --- .kokoro/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f3f82b46d..d28698287 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -72,7 +72,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -84,7 +84,7 @@ integration) integration-cloud-devel) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -99,7 +99,7 @@ integration-cloud-devel) integration-cloud-staging) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -114,14 +114,14 @@ integration-cloud-staging) graalvm) # Run Unit and Integration Tests with Native Image. mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" \ - -Dprotobuf.version=4.32.0 + -Dprotobuf.version=4.32.1 RETURN_CODE=$? ;; graalvmA) # Run Unit and Integration Tests with Native Image A. NATIVE_IMAGE_OPTIONS="--strict-image-heap" mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" \ - -Dprotobuf.version=4.32.0 + -Dprotobuf.version=4.32.1 RETURN_CODE=$? ;; samples) From c46de39474075d193732b81ec0ca92a4bd30ac66 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 21 Oct 2025 16:35:56 -0400 Subject: [PATCH 3/3] Update protobuf.version to 4.33.0 --- .kokoro/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d28698287..130538b85 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -72,7 +72,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.1 \ + -Dprotobuf.version=4.33.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -84,7 +84,7 @@ integration) integration-cloud-devel) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.1 \ + -Dprotobuf.version=4.33.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -99,7 +99,7 @@ integration-cloud-devel) integration-cloud-staging) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.32.1 \ + -Dprotobuf.version=4.33.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -114,14 +114,14 @@ integration-cloud-staging) graalvm) # Run Unit and Integration Tests with Native Image. mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" \ - -Dprotobuf.version=4.32.1 + -Dprotobuf.version=4.33.0 RETURN_CODE=$? ;; graalvmA) # Run Unit and Integration Tests with Native Image A. NATIVE_IMAGE_OPTIONS="--strict-image-heap" mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**" \ - -Dprotobuf.version=4.32.1 + -Dprotobuf.version=4.33.0 RETURN_CODE=$? ;; samples)