You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ja...@apache.org on 2026/04/22 19:40:17 UTC

(grails-gradle-publish) 01/02: chore: upgrade Gradle to 9.4.1

This is an automated email from the ASF dual-hosted git repository.

jamesfredley pushed a commit to branch upgrade-gradle-9.4.1
in repository https://gitbox.apache.org/repos/asf/grails-gradle-publish.git

commit abb90bd71872d2b9deb23c632948b8c1e55cc80c
Author: James Fredley <ja...@users.noreply.github.com>
AuthorDate: Wed Apr 22 15:38:48 2026 -0400

    chore: upgrade Gradle to 9.4.1
    
    - Update Gradle wrapper and .sdkmanrc from 8.14.3 to 9.4.1
    - Switch Groovy coordinates from org.codehaus.groovy (3.x) to
      org.apache.groovy (4.x) to match the Groovy version bundled with
      Gradle 9
    - Update Spock to 2.3-groovy-4.0 for Groovy 4 compatibility
    - Remove unused internal API import (DefaultMavenPomDeveloper) that
      was removed from Gradle's public internals in 9.x
    - Update plugin task registration tests to reflect the removal of the
      Software Model tasks (components, dependentComponents, model) in
      Gradle 9
    
    Assisted-by: claude-code:claude-opus-4
---
 .sdkmanrc                                           |   2 +-
 gradle/test-config.gradle                           |   4 ++--
 gradle/wrapper/gradle-wrapper.jar                   | Bin 43764 -> 48966 bytes
 gradle/wrapper/gradle-wrapper.properties            |   2 +-
 gradlew                                             |   7 ++-----
 gradlew.bat                                         |   3 +--
 plugin/build.gradle                                 |   6 +++---
 .../gradle/publish/GrailsPublishExtension.groovy    |   1 -
 .../publish/GrailsPublishGradlePluginTest.groovy    |   6 ------
 9 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/.sdkmanrc b/.sdkmanrc
index 09f237c..6afec96 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,2 +1,2 @@
 java=17.0.17-librca
-gradle=8.14.3
\ No newline at end of file
+gradle=9.4.1
\ No newline at end of file
diff --git a/gradle/test-config.gradle b/gradle/test-config.gradle
index 8764fa3..be3e23d 100644
--- a/gradle/test-config.gradle
+++ b/gradle/test-config.gradle
@@ -41,11 +41,11 @@ import org.gradle.api.plugins.jvm.JvmTestSuite
 testing {
     suites {
         test {
-            useSpock('2.3-groovy-3.0')
+            useSpock('2.3-groovy-4.0')
         }
 
         functionalTest(JvmTestSuite) {
-            useSpock('2.3-groovy-3.0')
+            useSpock('2.3-groovy-4.0')
 
             dependencies {
                 implementation project()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1b33c55..d997cfc 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 d4081da..c61a118 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-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 23d15a9..739907d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 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/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/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/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ 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" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index db3a6ac..c4bdd3a 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%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" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 7072bc6..67922bf 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -27,10 +27,10 @@ group = 'org.apache.grails.gradle'
 
 dependencies {
     // compile grails-gradle-plugin with the Groovy version provided by Gradle
-    // to ensure build compatibility with Gradle, currently Groovy 3.0.x
+    // to ensure build compatibility with Gradle, currently Groovy 4.0.x
     // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
-    api platform("org.codehaus.groovy:groovy-bom:${GroovySystem.version}")
-    compileOnly 'org.codehaus.groovy:groovy'
+    api platform("org.apache.groovy:groovy-bom:${GroovySystem.version}")
+    compileOnly 'org.apache.groovy:groovy'
 
     implementation "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
 }
diff --git a/plugin/src/main/groovy/org/apache/grails/gradle/publish/GrailsPublishExtension.groovy b/plugin/src/main/groovy/org/apache/grails/gradle/publish/GrailsPublishExtension.groovy
index 59a4de2..8a84327 100644
--- a/plugin/src/main/groovy/org/apache/grails/gradle/publish/GrailsPublishExtension.groovy
+++ b/plugin/src/main/groovy/org/apache/grails/gradle/publish/GrailsPublishExtension.groovy
@@ -26,7 +26,6 @@ import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.publish.maven.MavenPomDeveloper
-import org.gradle.api.publish.maven.internal.publication.DefaultMavenPomDeveloper
 import org.gradle.api.tasks.Nested
 
 import javax.inject.Inject
diff --git a/plugin/src/test/groovy/org/apache/grails/gradle/publish/GrailsPublishGradlePluginTest.groovy b/plugin/src/test/groovy/org/apache/grails/gradle/publish/GrailsPublishGradlePluginTest.groovy
index 8010cdc..cac8e94 100644
--- a/plugin/src/test/groovy/org/apache/grails/gradle/publish/GrailsPublishGradlePluginTest.groovy
+++ b/plugin/src/test/groovy/org/apache/grails/gradle/publish/GrailsPublishGradlePluginTest.groovy
@@ -107,10 +107,8 @@ class GrailsPublishGradlePluginTest extends Specification {
                 'closeStagingRepositories',
                 'compileJava',
                 'compileTestJava',
-                'components',
                 'dependencies',
                 'dependencyInsight',
-                'dependentComponents',
                 'findSonatypeStagingRepository',
                 'generateMetadataFileForMavenPublication',
                 'generatePomFileForMavenPublication',
@@ -123,7 +121,6 @@ class GrailsPublishGradlePluginTest extends Specification {
                 'javaToolchains',
                 'javadoc',
                 'javadocJar',
-                'model',
                 'outgoingVariants',
                 'processResources',
                 'processTestResources',
@@ -197,10 +194,8 @@ class GrailsPublishGradlePluginTest extends Specification {
                 'clean',
                 'compileJava',
                 'compileTestJava',
-                'components',
                 'dependencies',
                 'dependencyInsight',
-                'dependentComponents',
                 'generateMetadataFileForMavenPublication',
                 'generatePomFileForMavenPublication',
                 'grailsPublishValidation',
@@ -211,7 +206,6 @@ class GrailsPublishGradlePluginTest extends Specification {
                 'javaToolchains',
                 'javadoc',
                 'javadocJar',
-                'model',
                 'outgoingVariants',
                 'processResources',
                 'processTestResources',