This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-mcp.git
The following commit(s) were added to refs/heads/main by this push:
new 19b5994 chore(build): upgrade Gradle wrapper to 9.7.1 and retry
distribution downloads (#188)
19b5994 is described below
commit 19b5994596c1d28f75a89dbd3c695130ab26b7db
Author: Aditya Parikh <[email protected]>
AuthorDate: Fri Sep 11 09:49:56 2026 -0400
chore(build): upgrade Gradle wrapper to 9.7.1 and retry distribution
downloads (#188)
Bumps the Gradle wrapper from 9.4.1 to 9.7.1, generated with
`./gradlew wrapper --gradle-version 9.7.1 --distribution-type bin`
(run twice, so the wrapper jar is regenerated by 9.7.1 itself rather
than left at the 9.4.1 copy).
Nothing outside the wrapper pins a Gradle version -- no workflow in
.github/ and no entry in gradle/libs.versions.toml names one, since CI
invokes ./gradlew -- so gradle-wrapper.properties is the single source
of truth and this is the whole change.
The 9.7.1 generator emits two properties that did not exist in 9.4.1
output, `retries` and `retryBackOffMs`. They govern retrying the
download of the Gradle distribution itself, which happens before Gradle
exists locally and is therefore not reachable from build.gradle.kts.
The generated default is `retries=0` (one attempt, then fail); this
commit sets `retries=3` so a transient failure fetching
services.gradle.org surfaces as a retry rather than as a red build.
`networkTimeout` is a separate knob -- it bounds a single attempt and
does not retry.
Verified with a full `./gradlew build` on JDK 25: BUILD SUCCESSFUL,
with :rat, :spotlessJavaCheck, :test and :check all executed --
372 tests, 0 failures, 0 errors, 7 skipped.
One note for the future: the build now reports a Gradle 10
incompatibility, but it resolves to a single deprecated call,
ReportingExtension.file(String), which is made by a third-party plugin
and not by build.gradle.kts or buildSrc. It will clear on a plugin
bump; no build-script change is needed here.
Signed-off-by: Aditya Parikh <[email protected]>
Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
---
gradle/wrapper/gradle-wrapper.jar | Bin 45633 -> 47505 bytes
gradle/wrapper/gradle-wrapper.properties | 4 +++-
gradlew | 6 +++---
gradlew.bat | 35 +++++++++++--------------------
4 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index f8e1ee3..eddabd2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index c61a118..60f3b91 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
+retries=3
+retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index adff685..249efbb 100755
--- a/gradlew
+++ b/gradlew
@@ -20,7 +20,7 @@
##############################################################################
#
-# Gradle start up script for POSIX generated by Gradle.
+# gradlew start up script for POSIX generated by Gradle.
#
# Important for running:
#
@@ -29,7 +29,7 @@
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
-# ksh Gradle
+# ksh gradlew
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-#
https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#
https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/gradlew.bat b/gradlew.bat
index c4bdd3a..a51ec4f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -19,12 +19,12 @@
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
-@rem Gradle startup script for Windows
+@rem gradlew startup script for Windows
@rem
@rem ##########################################################################
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
-goto fail
+"%COMSPEC%" /c exit 1
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
-goto fail
+"%COMSPEC%" /c exit 1
:execute
@rem Setup the command line
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS%
"-Dorg.gradle.appname=%APP_BASE_NAME%" -jar
"%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables
are expanded
+@rem which allows us to clear the local environment before executing the java
command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS%
"-Dorg.gradle.appname=%APP_BASE_NAME%" -jar
"%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code
instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
