This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 8e73b73358 GROOVY-12006: Bump gradle to 9.5.0 (build)
8e73b73358 is described below
commit 8e73b733584709ffda2c622a2ff18a9f7fb53dc6
Author: Paul King <[email protected]>
AuthorDate: Tue May 12 19:14:28 2026 +1000
GROOVY-12006: Bump gradle to 9.5.0 (build)
---
gradle.properties | 2 +-
gradle/verification-metadata.xml | 30 ------------------------------
gradle/wrapper/gradle-wrapper.jar | Bin 48966 -> 43583 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 14 +++++++++-----
gradlew.bat | 3 ++-
6 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 2791bf9761..6713420fa6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ groovyTargetBytecodeVersion=17
targetJavaVersion=17
binaryCompatibilityBaseline=versions.latest5
-gradle_version=9.4.0
+gradle_version=9.5.0
groovyJUnit_ms=512m
groovyJUnit_mx=2g
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7ff145845a..e0f1c66a83 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -353,21 +353,11 @@
<sha512
value="d832a99867acc2d5afb2596da760c50e6a6b54c1bbc8e6c4186f267a16e1d55c7a916ef8b034ad6b277c41e3342b91dcdc2e3dcea8bdccfe89e7c147894591be"
origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.core" name="jackson-core"
version="2.21.0">
- <artifact name="jackson-core-2.21.0.jar">
- <sha512
value="4f00351e57ce480428216691c52c59a75ca824674d5c26ef902250cc3d012f22042c82eab9ca530c6328031b597239143e9e3b68c1c7a6cc6d49cef8cb420774"
origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="com.fasterxml.jackson.core" name="jackson-core"
version="2.21.2">
<artifact name="jackson-core-2.21.2.jar">
<sha512
value="31a16a40b2e1a1a9467a66c93884c034527fb5af641a79bd6a563d4c3aaa0cfc8d8250f930d13c7fd70c18db579940ec54a49538c5a2e0fb9780c575808000ff"
origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.core" name="jackson-databind"
version="2.21.0">
- <artifact name="jackson-databind-2.21.0.jar">
- <sha512
value="757949bf3a5d21f7a2d6567b1d2d80de60faaf11f8705b0d713e73361787cc78e12ffb328e9b2afee4e0dc005418599680bcbcc3a2c9df78cc9f29ecb60651ad"
origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="com.fasterxml.jackson.core" name="jackson-databind"
version="2.21.2">
<artifact name="jackson-databind-2.21.2.jar">
<sha512
value="1a47b012447bc8c3d0bc603b95fce1640d7fe7ead08bc33c106c0de811f061a1eda871863e4e1411e9c0c9c716d47c69960f7e492f54e8610f3e40c99f5c3962"
origin="Generated by Gradle"/>
@@ -378,31 +368,16 @@
<sha512
value="93e80b6bc1b4410bed9d5ecac305a1dfc55808f5fdf840ca8d74912f17b6cbb29d8d871a4d975bc905010334dfc95e0f96175d2434b2765fe4cd4a0f7ff7964f"
origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.dataformat"
name="jackson-dataformat-toml" version="2.21.0">
- <artifact name="jackson-dataformat-toml-2.21.0.jar">
- <sha512
value="f56f7121605d788dad1f32a5479471f72374676dd57af285726c3f6aaba5c5b60736478d77cc95629decd4ab93d63f3cc671191f4da202264a27dcc8e55fd051"
origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="com.fasterxml.jackson.dataformat"
name="jackson-dataformat-toml" version="2.21.2">
<artifact name="jackson-dataformat-toml-2.21.2.jar">
<sha512
value="fce5ecebbd849ecd899de69b6534948ca10b08cf7a2a79ddfae3729ae764a732b7aeb9cbd43408b83072d527162192f57b15c56751fc09e9788c6f17a3cf0b11"
origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.dataformat"
name="jackson-dataformat-xml" version="2.21.0">
- <artifact name="jackson-dataformat-xml-2.21.0.jar">
- <sha512
value="f6825e5a271b484a2221e848d20c2671b1165f8cb7a1e0f341a2d46fabb5fba31599a97efbf333d857c3127d463abfa34a76078d0097146c349b913799bbe191"
origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="com.fasterxml.jackson.dataformat"
name="jackson-dataformat-xml" version="2.21.2">
<artifact name="jackson-dataformat-xml-2.21.2.jar">
<sha512
value="319f1e9659996c275a31853f03812e2507d7246f0cecd7e78798f9166a767040bb6ca1f729e4ae4ab4e1bd0ade647d56fddae52dadf8a858e23fb639fca06559"
origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="com.fasterxml.jackson.dataformat"
name="jackson-dataformat-yaml" version="2.21.0">
- <artifact name="jackson-dataformat-yaml-2.21.0.jar">
- <sha512
value="f12b36d40c9540a8a7a39eaa59450c0cdbd2a125d84ea45049789adf54454c71dd0b12504dd9ab1a62947e0a2c369c4e944455a26ebdde433a943d08d8e7392c"
origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="com.fasterxml.jackson.dataformat"
name="jackson-dataformat-yaml" version="2.21.2">
<artifact name="jackson-dataformat-yaml-2.21.2.jar">
<sha512
value="b9c01e5219dd055771144633fc5f9fa3dfec96b19e8cd2920d5c80ee6ccf6b378e45d7387814d793cd4cfca24f2d19d5dbf236bf204f03e4c9109edca475a97e"
origin="Generated by Gradle"/>
@@ -979,11 +954,6 @@
<sha512
value="fea08e150473673b0608eaee3ae1cb4e73834039db80d3b758710d6baf3a5840a0878a4eb64739ae9bb21ccc7148c8520fe873616a3f6d5cdb4305deabdd015c"
origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="commons-io" name="commons-io" version="2.21.0">
- <artifact name="commons-io-2.21.0.jar">
- <sha512
value="7ac1aa4d834cd7cdecaee223a64c63d481810c73dfdb5109f402234a05cadf754e414cead99072f5140d4f7042ee084161935fb28129a631d908d989c5bbac5d"
origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="commons-io" name="commons-io" version="2.22.0">
<artifact name="commons-io-2.22.0.jar">
<pgp value="F4DD59C90148BDC52BEB90A4530AA5F25C25011F"/>
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index d997cfc60f..a4b76b9530 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 c61a118f7d..1a704683a0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
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.5.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 739907dfd1..f5feea6d6b 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-#
https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#
https://github.com/gradle/gradle/blob/HEAD/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/.
@@ -86,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set
(https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) ||
exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -114,6 +115,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -171,6 +173,7 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -203,14 +206,15 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to
contain shell fragments,
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not
allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is
an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
- -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index e509b2dd8f..9b42019c79 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,10 +70,11 @@ goto fail
:execute
@rem Setup the command line
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@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" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS%
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%"
org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell