Upgrade to Gradle 7

build.gradle

@@ -348,7 +348,6 @@ subprojects { project ->
     apply plugin: 'java-library'
     apply plugin: 'groovy'
     if(!isTestSuite) {
-        apply plugin: 'com.bmuschko.nexus'
         apply plugin: 'maven-publish'
         apply plugin: 'signing'
     }
@@ -359,12 +358,9 @@ subprojects { project ->
 
     if (!isTestSuite) {
 
-        modifyPom {
-            delegate.project {
-                def updatePom = pomInfo.clone()
-                updatePom.delegate = delegate
-                updatePom()
-            }
+        java {
+            withJavadocJar()
+            withSourcesJar()
         }
 
         publishing {
@@ -388,18 +384,35 @@ subprojects { project ->
 
             publications {
                 maven(MavenPublication) {
-                    from components.java
+                    pom {
+                        name = 'Grails® framework'
+                        description = 'Grails Web Application Framework'
+                        url = 'https://grails.org/'
+
+                        licenses {
+                            license {
+                                name = 'The Apache Software License, Version 2.0'
+                                url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                                distribution = 'repo'
+                            }
+                        }
 
-                    afterEvaluate {
-                        artifact source: sourcesJar, classifier: "sources"
-                        artifact source: javadocJar, classifier: "javadoc"
-                    }
-                    pom.withXml {
-                        def xml = asNode()
+                        scm {
+                            url = 'scm:[email protected]:grails/grails-core.git'
+                            connection = 'scm:[email protected]:grails/grails-core.git'
+                            developerConnection = 'scm:[email protected]:grails/grails-core.git'
+                        }
 
-                        xml.children().last() + pomInfo
+                        developers {
+                            developer {
+                                id = 'puneetbehl'
+                                name = 'Puneet Behl'
+                                email = '[email protected]'
+                            }
+                        }
                     }
 
+                    from components.java
                 }
             }
         }
@@ -453,6 +466,9 @@ subprojects { project ->
             "Implementation-Vendor": 'grails.org')
     }
 
+    tasks.withType(Jar) {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
 
     configure([compileGroovy, compileTestGroovy]) {
         groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G')

gradle/assemble.gradle

@@ -127,8 +127,11 @@ task populateDependencies(type: Sync, dependsOn: configurePopulateDependencies)
 // Can't use sync task here because this directory contains other things as well.
 task sourcesJars(type: Sync) {
     into homeSrcDir
-    from subprojects.findAll { !it.name.startsWith('grails-test-suite') && !it.name.startsWith('grails-dependencies') && !it.name.startsWith('grails-bom') }.sourcesJar*.outputs*.files
-
+    from subprojects
+            .findAll { subproject -> !subproject.name.startsWith('grails-test-suite') &&
+                    !subproject.name.startsWith('grails-dependencies') &&
+                    !subproject.name.startsWith('grails-bom')
+            }.sourcesJar*.outputs*.files
     // sourcesFor comes from GrailsBuildPlugin
     from { sourcesFor(libsConfigurations*.copyRecursive { it.name.startsWith('grails-datastore') }.collect { it.transitive = false; it }) }
 }

gradle/docs.gradle

@@ -116,9 +116,8 @@ task fetchGrailsDocsSource {
 
 task gdoc(type: GradleBuild, dependsOn: ["groovydoc", "fetchGrailsDocsSource"], group: 'documentation') {
     startParameter.setCurrentDir(new File("${buildDir}/grails-docs-src"));
-    startParameter.setSearchUpwards(false)
     startParameter.useEmptySettings()
-    buildFile = "${buildDir}/grails-docs-src/build.gradle"
+    dir = "${buildDir}/grails-docs-src/build.gradle"
     tasks = ["clean", "assemble"]
 
     doFirst {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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

grails-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerSpec.groovy

@@ -299,7 +299,7 @@ class ControllerActionTransformerSpec extends Specification {
         Method actionAsClosureMethodWithoutCommand = controller.getClass().getMethod('actionAsClos')
         actionAsClosureMethodWithoutCommand.isAnnotationPresent(Generated)
 
-        Method actionAsClosureMethodWitCommand = controller.getClass().getMethod('actionAsClos', myCommand.class)
+        Method actionAsClosureMethodWitCommand = controller.getClass().getMethod('actionAsClos', (Class) myCommand.class)
         actionAsClosureMethodWitCommand.isAnnotationPresent(Generated)
     }