From ebe5292b93afeadaa30aafc96dcf747d8341aa70 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Nov 2025 20:02:31 +0000 Subject: [PATCH 1/8] ci: extract_properties --- .kokoro/build.sh | 20 +++++++++++++++++++- .kokoro/common.sh | 24 +++++++++++++++++++++++- pom.xml | 4 ++-- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 33ce37cb8..cc037fd4f 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,22 @@ source ${scriptDir}/common.sh mvn -version echo ${JOB_TYPE} +declare -a VERSION_PROPERTIES_ARGS +VERSION_PROPERTIES_ARGS=( $(extract_properties "compatibility-versions.properties") ) +PROPS_STRING=$(echo $(extract_properties "compatibility-versions.properties")) +if [ -n "$PROPS_STRING" ]; then + echo "Injecting properties into MAVEN_OPTS: $PROPS_STRING" + export MAVEN_OPTS="${MAVEN_OPTS} ${PROPS_STRING}" +fi + +echo "mvn dependencies:tree" +mvn dependencies:tree -Dverbose + +echo "mvn help:effective-pom" +mvn help:effective-pom -Dverbose + +echo "Installing the project" + # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ mvn install -B -V -ntp \ @@ -97,6 +113,7 @@ samples) -Dclirr.skip=true \ -Denforcer.skip=true \ -fae \ + "${VERSION_PROPERTIES_ARGS[@]}" verify RETURN_CODE=$? popd @@ -105,7 +122,8 @@ samples) fi ;; clirr) - mvn -B -ntp -Denforcer.skip=true clirr:check + mvn -B -ntp -Denforcer.skip=true clirr:check \ + "${VERSION_PROPERTIES_ARGS[@]}" RETURN_CODE=$? ;; *) diff --git a/.kokoro/common.sh b/.kokoro/common.sh index f8f957af1..f5cae298a 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -57,4 +57,26 @@ function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } function msg() { println "$*" >&2; } function println() { printf '%s\n' "$(now) $*"; } -## Helper comment to trigger updated repo dependency release \ No newline at end of file +function extract_properties() { + local prop_file="$1" + + # Check if file exists + if [ ! -f "$prop_file" ]; then + return 0 + fi + + # Run awk to output formatted flags + awk -F= ' + # Skip comments and empty lines + /^#/ || /^[ \t]*$/ { next } + { + # Trim whitespace + gsub(/^[ \t]+|[ \t]+$/, "", $1) + gsub(/^[ \t]+|[ \t]+$/, "", $2) + + # Print only valid pairs + if ($1 != "" && $2 != "") { + print "-D" $1 "=" $2 + } + }' "$prop_file" +} diff --git a/pom.xml b/pom.xml index ab9799c18..b2037addc 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.13 5.6.0 1.4.4 - 3.23.8 + 3.23.8 1.7.36 1.10.1 @@ -85,7 +85,7 @@ com.google.cloud google-cloud-logging - ${logging.version} + ${google-cloud-logging.version} org.slf4j From 828093889153d4c2110c72df5370e3edbcf89f2b Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Nov 2025 20:18:35 +0000 Subject: [PATCH 2/8] Leverage .mvn/maven.config --- .kokoro/build.sh | 16 +++------------- .mvn/maven.config | 2 ++ 2 files changed, 5 insertions(+), 13 deletions(-) create mode 100644 .mvn/maven.config diff --git a/.kokoro/build.sh b/.kokoro/build.sh index cc037fd4f..195f1772c 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,16 +27,8 @@ source ${scriptDir}/common.sh mvn -version echo ${JOB_TYPE} -declare -a VERSION_PROPERTIES_ARGS -VERSION_PROPERTIES_ARGS=( $(extract_properties "compatibility-versions.properties") ) -PROPS_STRING=$(echo $(extract_properties "compatibility-versions.properties")) -if [ -n "$PROPS_STRING" ]; then - echo "Injecting properties into MAVEN_OPTS: $PROPS_STRING" - export MAVEN_OPTS="${MAVEN_OPTS} ${PROPS_STRING}" -fi - -echo "mvn dependencies:tree" -mvn dependencies:tree -Dverbose +echo "mvn dependency:tree" +mvn dependency:tree -Dverbose -Dincludes=com.google.cloud:google-cloud-logging echo "mvn help:effective-pom" mvn help:effective-pom -Dverbose @@ -113,7 +105,6 @@ samples) -Dclirr.skip=true \ -Denforcer.skip=true \ -fae \ - "${VERSION_PROPERTIES_ARGS[@]}" verify RETURN_CODE=$? popd @@ -122,8 +113,7 @@ samples) fi ;; clirr) - mvn -B -ntp -Denforcer.skip=true clirr:check \ - "${VERSION_PROPERTIES_ARGS[@]}" + mvn -B -ntp -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000000000..17ad69eac --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,2 @@ +-Dgoogle-cloud-logging.version=3.23.7 +-Dsdk-platform-java-config.version=3.54.1 From f511c2999769c753adcb65112596bb670225b7e5 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Nov 2025 20:19:47 +0000 Subject: [PATCH 3/8] revert .kokoro/common.sh --- .kokoro/common.sh | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/.kokoro/common.sh b/.kokoro/common.sh index f5cae298a..f8f957af1 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -57,26 +57,4 @@ function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } function msg() { println "$*" >&2; } function println() { printf '%s\n' "$(now) $*"; } -function extract_properties() { - local prop_file="$1" - - # Check if file exists - if [ ! -f "$prop_file" ]; then - return 0 - fi - - # Run awk to output formatted flags - awk -F= ' - # Skip comments and empty lines - /^#/ || /^[ \t]*$/ { next } - { - # Trim whitespace - gsub(/^[ \t]+|[ \t]+$/, "", $1) - gsub(/^[ \t]+|[ \t]+$/, "", $2) - - # Print only valid pairs - if ($1 != "" && $2 != "") { - print "-D" $1 "=" $2 - } - }' "$prop_file" -} +## Helper comment to trigger updated repo dependency release \ No newline at end of file From 8d100077f6b07e9e3d95093584fbc80cb1340c29 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Nov 2025 20:21:07 +0000 Subject: [PATCH 4/8] sdk-platform-config version --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2037addc..6865010ca 100644 --- a/pom.xml +++ b/pom.xml @@ -20,12 +20,13 @@ 3.23.8 1.7.36 1.10.1 + 3.54.1 com.google.cloud sdk-platform-java-config - 3.54.1 + ${sdk-platform-java-config.version} From bc481617116ae6b46e262fda4077de1025da1508 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Nov 2025 20:21:48 +0000 Subject: [PATCH 5/8] 3.54.0 --- .mvn/maven.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 17ad69eac..7d0884f33 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,2 @@ -Dgoogle-cloud-logging.version=3.23.7 --Dsdk-platform-java-config.version=3.54.1 +-Dsdk-platform-java-config.version=3.54.0 From f79ec923135af361856e015a1069649b001cb2b0 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Nov 2025 20:44:52 +0000 Subject: [PATCH 6/8] fix pom --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6865010ca..b2037addc 100644 --- a/pom.xml +++ b/pom.xml @@ -20,13 +20,12 @@ 3.23.8 1.7.36 1.10.1 - 3.54.1 com.google.cloud sdk-platform-java-config - ${sdk-platform-java-config.version} + 3.54.1 From abc5de4806bfb254078c505231d0b4ff1bddf555 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Nov 2025 22:05:45 +0000 Subject: [PATCH 7/8] remove maven.config for now --- .mvn/maven.config | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .mvn/maven.config diff --git a/.mvn/maven.config b/.mvn/maven.config deleted file mode 100644 index 7d0884f33..000000000 --- a/.mvn/maven.config +++ /dev/null @@ -1,2 +0,0 @@ --Dgoogle-cloud-logging.version=3.23.7 --Dsdk-platform-java-config.version=3.54.0 From e64f61359a9835a8c4062176c591d3d60ff680f6 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 20 Nov 2025 21:44:53 +0000 Subject: [PATCH 8/8] Adding gax in the path too --- .kokoro/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 195f1772c..b62c65a94 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,8 +27,8 @@ source ${scriptDir}/common.sh mvn -version echo ${JOB_TYPE} -echo "mvn dependency:tree" -mvn dependency:tree -Dverbose -Dincludes=com.google.cloud:google-cloud-logging +echo "mvn dependency:tree for google-cloud-logging and gax" +mvn dependency:tree -Dverbose -Dincludes=com.google.cloud:google-cloud-logging,com.google.api:gax echo "mvn help:effective-pom" mvn help:effective-pom -Dverbose