This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a commit to branch gradle8.14-groovy4.0.26-springboot3.4.5
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit e76a83b8ec40c525f9446c2b06df0708339da398
Author: James Fredley <jamesfred...@users.noreply.github.com>
AuthorDate: Tue Apr 29 13:14:43 2025 -0400
Update to Gradle 8.14, Spring Boot 3.4.5 and Groovy 4.0.26
---
.sdkmanrc | 2 +-
dependencies.gradle | 4 ++--
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 43583 -> 43764 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 6 +++---
gradlew.bat | 4 ++--
grails-gradle/gradle.properties | 2 +-
.../gsp-spring-boot/script/.sdkmanrc | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.sdkmanrc b/.sdkmanrc
index 518611cd0e..4c97103398 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
java=17.0.14-librca
-gradle=8.12.1
+gradle=8.14
diff --git a/dependencies.gradle b/dependencies.gradle
index e918c1c671..20dc98eef8 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -45,7 +45,7 @@ ext {
'profiles.version' : '10.0.2',
'gradle-spock.version' : '2.3-groovy-3.0',
'gradle-nexus-publish-plugin.version': '2.0.0',
- 'spring-boot.version' : '3.4.2',
+ 'spring-boot.version' : '3.4.5',
'springloaded.version' : '1.2.8.RELEASE',
]
@@ -86,7 +86,7 @@ ext {
'commons-codec.version' : '1.17.1',
'geb-spock.version' : '7.0',
'grails-profiles.version' : '10.0.2',
- 'groovy.version' : '4.0.25',
+ 'groovy.version' : '4.0.26',
'h2.version' : '2.3.232',
'jackson.version' : '2.18.2',
'jquery.version' : '3.7.1',
diff --git a/gradle.properties b/gradle.properties
index 1e2545f40a..4afcd18466 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ expectitCoreVersion=0.9.0
gradleExtraConfigurationsPluginVersion=10.0.1
gradleLicensePluginVersion=0.16.1
gradleToolingApiVersion=8.12.1
-groovyVersion=4.0.25
+groovyVersion=4.0.26
javaVersion=17
joptSimpleVersion=5.0.4
plexusComponentApiVersion=1.0-alpha-33
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index a4b76b9530..1b33c55baa 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 5fc9933800..12aa60d74f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -15,7 +15,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b0d..23d15a9367 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not
allowed to contain shell fragments,
+# * DEFAULT_JVM_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.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9b42019c79..5eed7ee845 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS%
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%"
org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS%
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar
"%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/grails-gradle/gradle.properties b/grails-gradle/gradle.properties
index 5469417266..99979e3a57 100644
--- a/grails-gradle/gradle.properties
+++ b/grails-gradle/gradle.properties
@@ -16,7 +16,7 @@
# This Groovy version should be the version used to build Grails applications
and NOT the version used by this project,
# since this project must use Gradle's Groovy version. This property will be
used to set up the test projects
# like Grails would, to ensure proper test coverage.
-e2eGroovyVersion=4.0.25
+e2eGroovyVersion=4.0.26
org.gradle.caching=true
org.gradle.daemon=true
diff --git a/grails-test-examples/gsp-spring-boot/script/.sdkmanrc
b/grails-test-examples/gsp-spring-boot/script/.sdkmanrc
index fdc46b9375..9f3feaa34a 100644
--- a/grails-test-examples/gsp-spring-boot/script/.sdkmanrc
+++ b/grails-test-examples/gsp-spring-boot/script/.sdkmanrc
@@ -1,3 +1,3 @@
java=17.0.12-librca
-groovy=4.0.23
-springboot=3.3.5
+groovy=4.0.26
+springboot=3.4.5
