Merge pull request #15365 from apache/upgrade/gradle-9.3.1

Upgrade to Gradle 9.4.1 and Micronaut 4

Author: jdaugherty

.sdkmanrc

@@ -1,6 +1,6 @@
 # Keep java version synced with .github/workflows/release.yml and etc/bin/Dockerfile
 java=21.0.7-librca
-# Keep gradle version synced with gradle.properties (gradleToolingApiVersion), all gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
-gradle=8.14.4
+# Keep gradle version synced with gradle.properties (gradleToolingApiVersion).
+# Update the gradle-bootstrap project to propagate the version to all gradle-wrapper.properties files.
+gradle=9.4.1
 

build-logic/docs-core/build.gradle

@@ -38,10 +38,9 @@ apply {
 dependencies {
     gradleConf gradleApi()
 
-    // grails-docs classes are used in Gradle builds,
-    // so we must compile with Groovy 3 until Gradle upgrades to Groovy 4.
-    compileOnly "org.codehaus.groovy:groovy:${GroovySystem.version}"
-    compileOnly "org.codehaus.groovy:groovy-ant:${GroovySystem.version}"
+    // grails-docs classes are used in Gradle builds, using Gradle's embedded Groovy version
+    compileOnly "org.apache.groovy:groovy:${GroovySystem.version}"
+    compileOnly "org.apache.groovy:groovy-ant:${GroovySystem.version}"
 
     api "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}"
     api "org.apache.ant:ant:${gradleBomDependencyVersions['ant.version']}"
@@ -56,7 +55,7 @@ dependencies {
         transitive = false
     }
 
-    testImplementation "org.codehaus.groovy:groovy-test-junit5:${GroovySystem.version}"
+    testImplementation "org.apache.groovy:groovy-test-junit5:${GroovySystem.version}"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2'
     testImplementation 'org.junit.platform:junit-platform-suite:1.12.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.2'

build-logic/docs-core/src/main/groovy/grails/doc/ant/DocPublisherTask.groovy

@@ -18,6 +18,7 @@
  */
 package grails.doc.ant
 
+import groovy.ant.AntBuilder
 import org.apache.tools.ant.BuildException
 import org.apache.tools.ant.Project
 import org.apache.tools.ant.Task

build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy

@@ -27,11 +27,13 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.DependencyConstraint
 import org.gradle.api.artifacts.ExcludeRule
 import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.artifacts.component.ModuleComponentSelector
+import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.artifacts.result.DependencyResult
 import org.gradle.api.artifacts.result.ResolvedDependencyResult
 import org.gradle.api.file.ConfigurableFileCollection
@@ -42,6 +44,7 @@ import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Classpath
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 
@@ -83,17 +86,26 @@ abstract class ExtractDependenciesTask extends DefaultTask {
     @Input
     abstract MapProperty<String, String> getProjectCoordinateProperties()
 
+    // Captured at configuration time to avoid deprecated Task.project access at execution time.
+    // See: https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:requirements:use_project_during_execution
+    @Internal
+    DependencyHandler dependencyHandler
+
+    @Internal
+    ConfigurationContainer configurationContainer
+
     void setConfiguration(NamedDomainObjectProvider<Configuration> config) {
         dependencyArtifacts.from(config)
         configurationName.set(config.name)
     }
 
-    ExtractDependenciesTask() {
-        doFirst {
-            if (!project.pluginManager.hasPlugin('java-platform')) {
-                throw new GradleException(/The 'java-platform' plugin must be applied to the project to use this task./)
-            }
-        }
+    /**
+     * Captures project-scoped services at configuration time so they can be used
+     * at execution time without accessing the deprecated Task.project property.
+     */
+    void captureProjectServices(DependencyHandler dependencies, ConfigurationContainer configurations) {
+        this.dependencyHandler = dependencies
+        this.configurationContainer = configurations
     }
 
     @TaskAction
@@ -115,7 +127,7 @@ abstract class ExtractDependenciesTask extends DefaultTask {
             propertyNameCalculator.addProject(coordinates.groupId, coordinates.artifactId, coordinates.version, entry.value)
         }
 
-        Configuration configuration = project.configurations.named(configurationName.get()).get()
+        Configuration configuration = configurationContainer.named(configurationName.get()).get()
         if (!configuration.canBeResolved) {
             throw new GradleException("The configuration ${configuration.name} must be resolvable to use this task.")
         }
@@ -208,8 +220,8 @@ abstract class ExtractDependenciesTask extends DefaultTask {
     }
 
     Properties populatePlatformDependencies(CoordinateVersionHolder bomCoordinates, List<CoordinateHolder> exclusionRules, Map<CoordinateHolder, ExtractedDependencyConstraint> constraints, boolean error = true, int level = 0) {
-        Dependency bomDependency = project.dependencies.create("${bomCoordinates.coordinates}@pom")
-        Configuration dependencyConfiguration = project.configurations.detachedConfiguration(bomDependency)
+        Dependency bomDependency = dependencyHandler.create("${bomCoordinates.coordinates}@pom")
+        Configuration dependencyConfiguration = configurationContainer.detachedConfiguration(bomDependency)
         File bomPomFile = dependencyConfiguration.singleFile
 
         MavenXpp3Reader reader = new MavenXpp3Reader()

build-logic/gradle/wrapper/gradle-wrapper.jar

@@ -2,7 +2,7 @@
 # and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

build-logic/gradle/wrapper/gradle-wrapper.properties

@@ -92,9 +92,14 @@ class PublishPlugin implements Plugin<Project> {
             task.group = 'publishing'
             task.outputs.dir(artifactsDir)
             task.dependsOn(project.tasks.withType(Jar))
+
+            // Capture publishing extension at configuration time to avoid Task.project access at execution time
+            // See: https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:requirements:use_project_during_execution
+            def publishingExtension = project.extensions.getByType(PublishingExtension)
+
             task.doLast {
                 Map<String, String> artifacts = [:]
-                project.extensions.getByType(PublishingExtension).publications.withType(MavenPublication).each { MavenPublication publication ->
+                publishingExtension.publications.withType(MavenPublication).each { MavenPublication publication ->
                     publication.artifacts.each { MavenArtifact artifact ->
                         if (!artifact.file.exists() || artifact.file.name in ['grails-plugin.xml', 'profile.yml']) {
                             return