From 91c80b575b2a342c50bd56970f5f1688f4de1e0a Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 28 Aug 2024 12:33:56 -0400 Subject: [PATCH 1/6] chore: Update to Protobuf-Java 4.27.4 --- .kokoro/build.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 205347243..3874998ef 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,81 @@ source ${scriptDir}/common.sh mvn -version echo ${JOB_TYPE} +# Store the current Java version since the version may change when installing sdk-platform-java +current_java_home=$JAVA_HOME + +# testing-infra-docker has Java 11 installed in java8 docker container. Use this as sdk-platform-java +# needs Java 11+ to run with GraalVM. For GH actions, JAVA11_HOME does not exist and would skip this. +if [ ! -z "${JAVA11_HOME}" ]; then + export JAVA_HOME="${JAVA11_HOME}" + export PATH=${JAVA_HOME}/bin:$PATH +fi + +# Get the current proto runtime version used in this repo +CURRENT_PROTO_VERSION=$(mvn -ntp help:effective-pom | +sed -n "/protobuf-java<\/artifactId>/,/<\/dependency>/ { + //{ + s/\(.*\)<\/version>/\1/p + q + } +}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') +echo "The current proto version is: ${CURRENT_PROTO_VERSION}" + +# Find the latest proto runtime version available +LATEST_PROTO_VERSION="4.27.4" +echo "The latest proto version is: ${LATEST_PROTO_VERSION}" + +# Only reinstall shared-deps again to test for a newer proto version +if [[ "${CURRENT_PROTO_VERSION}" != "${LATEST_PROTO_VERSION}" ]]; then + pushd /tmp + git clone https://github.com/googleapis/sdk-platform-java.git + pushd sdk-platform-java + pushd gapic-generator-java-pom-parent + sed -i "/.*<\/protobuf.version>/s/\(.*\).*\(<\/protobuf.version>\)/\1${LATEST_PROTO_VERSION}\2/" pom.xml + # sdk-platform-java + popd + + pushd sdk-platform-java-config + # Get current Shared-Deps version in sdk-platform-java + SHARED_DEPS_VERSION=$(mvn -ntp help:effective-pom | + sed -n "/sdk-platform-java-config<\/artifactId>/,/<\/dependency>/ { + //{ + s/\(.*\)<\/version>/\1/p + q + } + }" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + echo "Shared-Deps Version: ${SHARED_DEPS_VERSION}" + # sdk-platform-java + popd + + mvn clean install -q -ntp \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -T 1C + # /tmp + popd + + # Back to the original directory of the repo + popd + # Find all the poms with a reference to shared-deps and update to the new local version + poms=($(find . -name pom.xml)) + for pom in "${poms[@]}"; do + if grep -q "sdk-platform-java-config" "${pom}"; then + echo "Updating the pom: ${pom} to use shared-deps version: ${SHARED_DEPS_VERSION}" + sed -i "/sdk-platform-java-config<\/artifactId>/,/<\/parent>/ s/.*<\/version>/$SHARED_DEPS_VERSION<\/version>/" "${pom}" +# xmlstarlet ed --inplace -N x="http://maven.apache.org/POM/4.0.0" \ +# -u "//x:project/x:parent[x:artifactId='sdk-platform-java-config']/x:version" \ +# -v "${SHARED_DEPS_VERSION}" \ +# "${pom}" + fi + done +fi + +# Reset back to the original Java version if changed +export JAVA_HOME="${current_java_home}" +export PATH=${JAVA_HOME}/bin:$PATH + # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ mvn install -B -V -ntp \ From 0edffc8fd82c09dc5a605bacea7b57ab842f878a Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 10 Sep 2024 17:15:51 -0400 Subject: [PATCH 2/6] chore: Test script --- .github/workflows/ci.yaml | 4 +- .kokoro/build.sh | 22 +++--- .../clirr-ignored-differences.xml | 67 +++++++++++++++++++ .../clirr-ignored-differences.xml | 67 +++++++++++++++++++ .../clirr-ignored-differences.xml | 67 +++++++++++++++++++ 5 files changed, 214 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b91fa381f..8aa5b7b9e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -67,7 +67,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 - run: java -version - run: .kokoro/build.bat env: @@ -116,7 +116,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 - run: java -version - run: .kokoro/build.sh env: diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 3874998ef..6bceb5c99 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -30,13 +30,6 @@ echo ${JOB_TYPE} # Store the current Java version since the version may change when installing sdk-platform-java current_java_home=$JAVA_HOME -# testing-infra-docker has Java 11 installed in java8 docker container. Use this as sdk-platform-java -# needs Java 11+ to run with GraalVM. For GH actions, JAVA11_HOME does not exist and would skip this. -if [ ! -z "${JAVA11_HOME}" ]; then - export JAVA_HOME="${JAVA11_HOME}" - export PATH=${JAVA_HOME}/bin:$PATH -fi - # Get the current proto runtime version used in this repo CURRENT_PROTO_VERSION=$(mvn -ntp help:effective-pom | sed -n "/protobuf-java<\/artifactId>/,/<\/dependency>/ { @@ -53,6 +46,13 @@ echo "The latest proto version is: ${LATEST_PROTO_VERSION}" # Only reinstall shared-deps again to test for a newer proto version if [[ "${CURRENT_PROTO_VERSION}" != "${LATEST_PROTO_VERSION}" ]]; then + # testing-infra-docker has Java 11 installed in java8 docker container. Use this as sdk-platform-java + # needs Java 11+ to run with GraalVM. For GH actions, JAVA11_HOME does not exist and would skip this. + if [ ! -z "${JAVA11_HOME}" ]; then + export JAVA_HOME="${JAVA11_HOME}" + export PATH=${JAVA_HOME}/bin:$PATH + fi + pushd /tmp git clone https://github.com/googleapis/sdk-platform-java.git pushd sdk-platform-java @@ -96,11 +96,11 @@ if [[ "${CURRENT_PROTO_VERSION}" != "${LATEST_PROTO_VERSION}" ]]; then # "${pom}" fi done -fi -# Reset back to the original Java version if changed -export JAVA_HOME="${current_java_home}" -export PATH=${JAVA_HOME}/bin:$PATH + # Reset back to the original Java version if changed + export JAVA_HOME="${current_java_home}" + export PATH=${JAVA_HOME}/bin:$PATH +fi # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ diff --git a/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml b/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml index dcf66f723..1192cf3e9 100644 --- a/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml @@ -32,4 +32,71 @@ com/google/firestore/admin/v1/*OrBuilder boolean has*(*) + + + 7006 + com/google/firestore/admin/v1/** + * getDefaultInstanceForType() + ** + + + 7006 + com/google/firestore/admin/v1/** + * addRepeatedField(*) + ** + + + 7006 + com/google/firestore/admin/v1/** + * clear() + ** + + + 7006 + com/google/firestore/admin/v1/** + * clear() + ** + + + 7006 + com/google/firestore/admin/v1/** + * clearField(*) + ** + + + 7006 + com/google/firestore/admin/v1/** + * clearOneof(*) + ** + + + 7006 + com/google/firestore/admin/v1/** + * clone() + ** + + + 7006 + com/google/firestore/admin/v1/** + * mergeUnknownFields(*) + ** + + + 7006 + com/google/firestore/admin/v1/** + * setField(*) + ** + + + 7006 + com/google/firestore/admin/v1/** + * setRepeatedField(*) + ** + + + 7006 + com/google/firestore/admin/v1/** + * setUnknownFields(*) + ** + diff --git a/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml b/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml index cee6f93d2..f210c8dc1 100644 --- a/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml @@ -16,4 +16,71 @@ com/google/firestore/bundle/*OrBuilder boolean has*(*) + + + 7006 + com/google/firestore/bundle/** + * getDefaultInstanceForType() + ** + + + 7006 + com/google/firestore/bundle/** + * addRepeatedField(*) + ** + + + 7006 + com/google/firestore/bundle/** + * clear() + ** + + + 7006 + com/google/firestore/bundle/** + * clear() + ** + + + 7006 + com/google/firestore/bundle/** + * clearField(*) + ** + + + 7006 + com/google/firestore/bundle/** + * clearOneof(*) + ** + + + 7006 + com/google/firestore/bundle/** + * clone() + ** + + + 7006 + com/google/firestore/bundle/** + * mergeUnknownFields(*) + ** + + + 7006 + com/google/firestore/bundle/** + * setField(*) + ** + + + 7006 + com/google/firestore/bundle/** + * setRepeatedField(*) + ** + + + 7006 + com/google/firestore/bundle/** + * setUnknownFields(*) + ** + diff --git a/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml b/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml index 4113a9e55..f744bcc6d 100644 --- a/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml @@ -136,4 +136,71 @@ com/google/firestore/v1/StructuredQueryOrBuilder boolean hasFindNearest() + + + 7006 + com/google/firestore/v1/** + * getDefaultInstanceForType() + ** + + + 7006 + com/google/firestore/v1/** + * addRepeatedField(*) + ** + + + 7006 + com/google/firestore/v1/** + * clear() + ** + + + 7006 + com/google/firestore/v1/** + * clear() + ** + + + 7006 + com/google/firestore/v1/** + * clearField(*) + ** + + + 7006 + com/google/firestore/v1/** + * clearOneof(*) + ** + + + 7006 + com/google/firestore/v1/** + * clone() + ** + + + 7006 + com/google/firestore/v1/** + * mergeUnknownFields(*) + ** + + + 7006 + com/google/firestore/v1/** + * setField(*) + ** + + + 7006 + com/google/firestore/v1/** + * setRepeatedField(*) + ** + + + 7006 + com/google/firestore/v1/** + * setUnknownFields(*) + ** + From fc8fdc6fe6bd2e588834b9c3d52aaf8c0f3e7750 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 10 Sep 2024 17:27:58 -0400 Subject: [PATCH 3/6] chore: Test script --- .../clirr-ignored-differences.xml | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml b/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml index c73578a05..b43b7d55c 100644 --- a/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-firestore-v1/clirr-ignored-differences.xml @@ -136,6 +136,31 @@ com/google/firestore/v1/StructuredQueryOrBuilder boolean hasFindNearest() + + 7012 + com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder + java.lang.String getDistanceResultField() + + + 7012 + com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder + com.google.protobuf.ByteString getDistanceResultFieldBytes() + + + 7012 + com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder + com.google.protobuf.DoubleValue getDistanceThreshold() + + + 7012 + com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder + com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder() + + + 7012 + com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder + boolean hasDistanceThreshold() + 7006 @@ -202,29 +227,5 @@ com/google/firestore/v1/** * setUnknownFields(*) ** - - 7012 - com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder - java.lang.String getDistanceResultField() - - - 7012 - com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder - com.google.protobuf.ByteString getDistanceResultFieldBytes() - - - 7012 - com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder - com.google.protobuf.DoubleValue getDistanceThreshold() - - - 7012 - com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder - com.google.protobuf.DoubleValueOrBuilder getDistanceThresholdOrBuilder() - - - 7012 - com/google/firestore/v1/StructuredQuery$FindNearestOrBuilder - boolean hasDistanceThreshold() From 725c25bf928113a581c53bf37dc7f126eaef1df9 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Thu, 19 Sep 2024 11:22:47 -0400 Subject: [PATCH 4/6] chore: Update to Protobuf 4.28.2 --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 6bceb5c99..d1bdff759 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -41,7 +41,7 @@ sed -n "/protobuf-java<\/artifactId>/,/<\/dependency>/ { echo "The current proto version is: ${CURRENT_PROTO_VERSION}" # Find the latest proto runtime version available -LATEST_PROTO_VERSION="4.27.4" +LATEST_PROTO_VERSION="4.28.2" echo "The latest proto version is: ${LATEST_PROTO_VERSION}" # Only reinstall shared-deps again to test for a newer proto version From 91a555756c012ca2f0239d5f5be624e318fa225a Mon Sep 17 00:00:00 2001 From: Mila <107142260+milaGGL@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:26:58 -0400 Subject: [PATCH 5/6] Fix: fix clirr check failure (#1841) --- google-cloud-firestore/clirr-ignored-differences.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/google-cloud-firestore/clirr-ignored-differences.xml b/google-cloud-firestore/clirr-ignored-differences.xml index 7a4c83689..3c42178c0 100644 --- a/google-cloud-firestore/clirr-ignored-differences.xml +++ b/google-cloud-firestore/clirr-ignored-differences.xml @@ -299,4 +299,11 @@ com/google/cloud/firestore/collection/StandardComparator * + + + + 8001 + com/google/cloud/firestore/encoding/CustomClassMapper + * + From 1f42885d59c0ef30faab9696345665239c1ec163 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 10 Sep 2024 17:15:51 -0400 Subject: [PATCH 6/6] chore: Test script --- .../clirr-ignored-differences.xml | 1 - .../clirr-ignored-differences.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml b/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml index 1de79b778..345ca8e0c 100644 --- a/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml @@ -33,7 +33,6 @@ boolean has*(*) - 7006 com/google/firestore/admin/v1/** diff --git a/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml b/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml index 713d4037f..48523e68f 100644 --- a/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-firestore-bundle-v1/clirr-ignored-differences.xml @@ -17,7 +17,6 @@ boolean has*(*) - 7006 com/google/firestore/bundle/**