From 4740d3f717268c16b9e2e009ab2807813a315b3a Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Mon, 2 Nov 2026 20:51:04 +0000 Subject: [PATCH 1/4] chore(kokoro): fix maven shared install locking issue on osx Adds GCS Central mirror settings to Maven execution and configures aether timeout to fail fast on stalled network connections in order to release NamedLocks. --- .kokoro/build.sh | 16 ++++++++++++++++ .kokoro/common.sh | 14 +++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index ecdd0a3ea514..c3a0d6b9df1e 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,10 @@ case ${JOB_TYPE} in -Dorg.slf4j.simpleLogger.showDateTime=true \ -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -Dmaven.wagon.http.retryHandler.count=5 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ "${EXCLUDE_PROJECTS_OPTS[@]}" \ -T 1C RETURN_CODE=$? @@ -95,7 +99,15 @@ case ${JOB_TYPE} in -Dorg.slf4j.simpleLogger.showDateTime=true \ -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -Dmaven.wagon.http.retryHandler.count=5 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ -DskipTests=true \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ --also-make \ -T 1C fi @@ -162,6 +174,10 @@ case ${JOB_TYPE} in -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipUnitTests=true \ -Dmaven.wagon.http.retryHandler.count=5 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ ${SUREFIRE_JVM_OPT} RETURN_CODE=$? diff --git a/.kokoro/common.sh b/.kokoro/common.sh index 84e36200685f..04f7165b1b37 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -458,6 +458,10 @@ function run_integration_tests() { -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipUnitTests=true \ -Dmaven.wagon.http.retryHandler.count=5 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ -T 1C RETURN_CODE=$? @@ -544,6 +548,10 @@ function install_modules() { -Dorg.slf4j.simpleLogger.showDateTime=true \ -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipTests=true \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -623,6 +631,10 @@ function install_modules() { -Dorg.slf4j.simpleLogger.showDateTime=true \ -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipTests=true \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -723,5 +735,5 @@ function install_repo_modules { fi echo "Installing this repo's modules to local maven." mvn -q -B -ntp install ${projects_arg} \ - -Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C + -Dcheckstyle.skip -Dfmt.skip -DskipTests -Daether.connector.http.retryHandler.count=5 -Daether.connector.requestTimeout=120000 -T 1C } From 3803abd72feb1cbc06144a70a552997cee468ce5 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Mon, 2 Nov 2026 21:03:09 +0000 Subject: [PATCH 2/4] Addressed comments --- .kokoro/build.sh | 10 ---------- .kokoro/common.sh | 12 +----------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index c3a0d6b9df1e..b19e6272d95e 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -71,8 +71,6 @@ case ${JOB_TYPE} in -Dmaven.wagon.http.retryHandler.count=5 \ -Daether.connector.http.retryHandler.count=5 \ -Daether.connector.requestTimeout=120000 \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ "${EXCLUDE_PROJECTS_OPTS[@]}" \ -T 1C RETURN_CODE=$? @@ -100,14 +98,8 @@ case ${JOB_TYPE} in -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -Dmaven.wagon.http.retryHandler.count=5 \ -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ - -Daether.connector.http.retryHandler.count=5 \ -Daether.connector.requestTimeout=120000 \ -DskipTests=true \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ --also-make \ -T 1C fi @@ -176,8 +168,6 @@ case ${JOB_TYPE} in -Dmaven.wagon.http.retryHandler.count=5 \ -Daether.connector.http.retryHandler.count=5 \ -Daether.connector.requestTimeout=120000 \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ ${SUREFIRE_JVM_OPT} RETURN_CODE=$? diff --git a/.kokoro/common.sh b/.kokoro/common.sh index 04f7165b1b37..b136226cb159 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -460,8 +460,6 @@ function run_integration_tests() { -Dmaven.wagon.http.retryHandler.count=5 \ -Daether.connector.http.retryHandler.count=5 \ -Daether.connector.requestTimeout=120000 \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ -T 1C RETURN_CODE=$? @@ -548,10 +546,6 @@ function install_modules() { -Dorg.slf4j.simpleLogger.showDateTime=true \ -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipTests=true \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -631,10 +625,6 @@ function install_modules() { -Dorg.slf4j.simpleLogger.showDateTime=true \ -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipTests=true \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ - -Daether.connector.http.retryHandler.count=5 \ - -Daether.connector.requestTimeout=120000 \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -735,5 +725,5 @@ function install_repo_modules { fi echo "Installing this repo's modules to local maven." mvn -q -B -ntp install ${projects_arg} \ - -Dcheckstyle.skip -Dfmt.skip -DskipTests -Daether.connector.http.retryHandler.count=5 -Daether.connector.requestTimeout=120000 -T 1C + -Dcheckstyle.skip -Dfmt.skip -Daether.connector.http.retryHandler.count=5 -Daether.connector.requestTimeout=120000 -DskipTests -T 1C } From 52e755b0512ccc70c45caf73425ea857edf5a02c Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Mon, 2 Nov 2026 21:14:55 +0000 Subject: [PATCH 3/4] Addressed comments --- .kokoro/common.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.kokoro/common.sh b/.kokoro/common.sh index b136226cb159..c8b7cb249b29 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -458,6 +458,7 @@ function run_integration_tests() { -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipUnitTests=true \ -Dmaven.wagon.http.retryHandler.count=5 \ + -Daether.connector.http.retryHandler.count=5 \ -Daether.connector.requestTimeout=120000 \ -T 1C @@ -725,5 +726,11 @@ function install_repo_modules { fi echo "Installing this repo's modules to local maven." mvn -q -B -ntp install ${projects_arg} \ - -Dcheckstyle.skip -Dfmt.skip -Daether.connector.http.retryHandler.count=5 -Daether.connector.requestTimeout=120000 -DskipTests -T 1C + -Dcheckstyle.skip \ + -Dfmt.skip \ + + -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.requestTimeout=120000 \ + -DskipTests \ + -T 1C } From 211af0eecdd241423a0c1478d88697075bbb445a Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Mon, 2 Nov 2026 21:25:59 +0000 Subject: [PATCH 4/4] Addressed comments --- .kokoro/common.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.kokoro/common.sh b/.kokoro/common.sh index c8b7cb249b29..bbc79c14a0e7 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -458,8 +458,7 @@ function run_integration_tests() { -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -DskipUnitTests=true \ -Dmaven.wagon.http.retryHandler.count=5 \ - - -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.http.retryHandler.count=5 \ -Daether.connector.requestTimeout=120000 \ -T 1C @@ -728,8 +727,7 @@ function install_repo_modules { mvn -q -B -ntp install ${projects_arg} \ -Dcheckstyle.skip \ -Dfmt.skip \ - - -Daether.connector.http.retryHandler.count=5 \ + -Daether.connector.http.retryHandler.count=5 \ -Daether.connector.requestTimeout=120000 \ -DskipTests \ -T 1C