Merge branch '7.1.x' into 7.1.x-scaffold-service-controller

codeconsole · codeconsole · commit cecef1d4a4bf · 2025-11-28T17:00:09.000-08:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -521,11 +521,11 @@ jobs:
           echo "::group::Manual Grails Forge deployment"
           echo "Kick off Forge-* workflow for version ${VERSION} based on the below rules:"
           cat <<'EOF'
-          * RELEASE - GA releases only
-          * NEXT - Milestones and Release Candidate
-          * SNAPSHOT - current or next version snapshot
-          * PREV - previous release version
-          * PREV-SNAPSHOT - previous version snapshot
+          * RELEASE - Full Final Releases - https://github.com/apache/grails-core/actions/workflows/forge-deploy-release.yml
+          * NEXT - Milestones and Release Candidate for Next Release (also Next version snapshot prior to Milestone) - https://github.com/apache/grails-core/actions/workflows/forge-deploy-next.yml
+          * SNAPSHOT - current or next version snapshot - https://github.com/apache/grails-core/actions/workflows/forge-deploy-snapshot.yml
+          * PREV - previous release version - https://github.com/apache/grails-core/actions/workflows/forge-deploy-prev.yml
+          * PREV-SNAPSHOT - previous version snapshot - https://github.com/apache/grails-core/actions/workflows/forge-deploy-prev-snapshot.yml
           EOF
           echo "::endgroup::"
   docs:
@@ -637,6 +637,16 @@ jobs:
           echo "::group::Blog Post Creation - MANUAL"
           echo "Publish a blog post on https://grails.apache.org/blog/ about the new release [${VERSION}] using the repo https://github.com/apache/grails-static-website"
           echo "::endgroup::"
+      - name: "🌎 MANUAL - Merge Close Release PR"
+        run: |
+          echo "::group::Merge Close Release PR - MANUAL"
+          echo "The last step in the grails-core release workflow will create a merge branch for the original tag with version number and then open a PR to merge back into the next branch. You will need to merge this PR into the branch after correcting any merge conflict."
+          echo "::endgroup::"
+      - name: "🌎 MANUAL - deploy the new SNAPSHOT to Forge"
+        run: |
+          echo "::group::Deploy the new SNAPSHOT to Forge - MANUAL"
+          echo "After the Close Release PR is merged, deploy the new SNAPSHOT to Forge via: https://github.com/apache/grails-core/actions/workflows/forge-deploy-snapshot.yml"
+          echo "::endgroup::"
       - name: '📧 Announcement Email'
         run: |
           echo "::group::Announcement Email"
diff --git a/RELEASE.md b/RELEASE.md
@@ -297,11 +297,11 @@ Publish the released version to [Grails Forge](https://start.grails.org) using o
 
 Grails Forge organizes deployments into version slots as follows:
 
-- **RELEASE** - GA releases only
-- **NEXT** - Milestones and Release Candidate
-- **SNAPSHOT** - current or next version snapshot
-- **PREV** - previous release version
-- **PREV-SNAPSHOT** - previous version snapshot
+- **RELEASE** - Full Final Releases - https://github.com/apache/grails-core/actions/workflows/forge-deploy-release.yml
+- **NEXT** - Milestones and Release Candidate for Next Release (also Next version snapshot prior to Milestone) - https://github.com/apache/grails-core/actions/workflows/forge-deploy-next.yml
+- **SNAPSHOT** - current or next version snapshot - https://github.com/apache/grails-core/actions/workflows/forge-deploy-snapshot.yml
+- **PREV** - previous release version - https://github.com/apache/grails-core/actions/workflows/forge-deploy-prev.yml
+- **PREV-SNAPSHOT** - previous version snapshot - https://github.com/apache/grails-core/actions/workflows/forge-deploy-prev-snapshot.yml
 
 Use the action whose name matches the slot you want to deploy to.\
 In the **“Run workflow/Use workflow from”** dropdown, choose the release tag you just created.
@@ -322,6 +322,8 @@ version from Maven Central.
 
 The last step in the `grails-core` release workflow is to run the `Close Release` step.  This will create a merge branch for the original tag with version number and then open a PR to merge back into the next branch.  You will need to merge this PR into the branch after correcting any merge conflict.
 
+After this PR is merged, deploy the new SNAPSHOT to Forge via: https://github.com/apache/grails-core/actions/workflows/forge-deploy-snapshot.yml
+
 ### Update the `grails-static-website`
 
 On the `grails-static-website` repository:
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/PublishPlugin.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/PublishPlugin.groovy
@@ -183,7 +183,7 @@ class PublishPlugin implements Plugin<Project> {
                 it.url.set('https://apache.org/')
             }
             it.developers.set(project.provider { lookupProperty(project, 'pomDevelopers', determineDevelopers(project))})
-            it.pomCustomization = lookupProperty(project, 'pomCustomization') as Closure
+            it.pomCustomization.set(project.provider { lookupProperty(project, 'pomCustomization') as Closure })
             it.publishTestSources.set(project.provider { lookupProperty(project, 'pomPublishTestSources', false)})
             it.testRepositoryPath.set(project.provider { shouldSkipJavaComponent(project) ? null : findRootGrailsCoreDir(project).dir('build/local-maven')})
             it.publicationName.set(project.provider { lookupProperty(project, 'pomMavenPublicationName', 'maven')})
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -30,15 +30,15 @@ ext {
             'commons-text.version'          : '1.13.1',
             'directory-watcher.version'     : '0.19.1',
             'gradle-spock.version'          : '2.3-groovy-3.0',
-            'grails-publish-plugin.version' : '0.0.2',
+            'grails-publish-plugin.version' : '0.0.3-SNAPSHOT',
             'jansi.version'                 : '1.18',
             'javaparser-core.version'       : '3.27.0',
             'jline.version'                 : '2.14.6',
             'jna.version'                   : '5.17.0',
             'jquery.version'                : '3.7.1',
             'objenesis.version'             : '3.4',
             'gradle-spock.version'          : '2.3-groovy-3.0',
-            'spring-boot.version'           : '3.5.7',
+            'spring-boot.version'           : '3.5.8',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
diff --git a/etc/bin/verify.sh b/etc/bin/verify.sh
@@ -109,7 +109,7 @@ echo "✅ RAT passed"
 
 echo "Verifying Reproducible Build ..."
 set +e # because we have known issues here
-verify-reproducible.sh "${DOWNLOAD_LOCATION}"
+"${SCRIPT_DIR}/verify-reproducible.sh" "${DOWNLOAD_LOCATION}"
 set -e
 echo "✅ Reproducible Build Verified"
 
diff --git a/grails-doc/src/en/guide/upgrading/upgrading60x.adoc b/grails-doc/src/en/guide/upgrading/upgrading60x.adoc
@@ -224,10 +224,11 @@ To apply and configure the `gradle-jakartaee-migration-plugin` in your `build.gr
 .build.gradle
 ----
 plugins {
-    id 'com.netflix.nebula.jakartaee-migration' version '0.24.0'
+    id 'com.netflix.nebula.jakartaee-migration'  version '1.0.0'
 }
 
 jakartaeeMigration {
+    includeTransform('org.grails.plugins:export')
     migrate()
 }
 ----
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/urlMappings.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/urlMappings.rocker.raw
@@ -27,6 +27,7 @@ package @project.getPackageName()
 class UrlMappings {
     static mappings = {
 @if(applicationType == ApplicationType.WEB || applicationType == ApplicationType.WEB_PLUGIN) {
+        "/$namespace/$controller/$action?/$id?(.$format)?" {}
         "/$controller/$action?/$id?(.$format)?"{
             constraints {
                 // apply constraints here
diff --git a/grails-forge/grails-forge-core/src/main/resources/gsp/index.gsp b/grails-forge/grails-forge-core/src/main/resources/gsp/index.gsp
@@ -71,7 +71,7 @@
                 <ul>
                     <g:each var="c" in="${grailsApplication.controllerClasses.sort { it.fullName } }">
                         <li class="controller">
-                            <g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link>
+                            <g:link namespace="${c.namespace}" controller="${c.logicalPropertyName}">${c.fullName}</g:link>
                         </li>
                     </g:each>
                 </ul>
diff --git a/grails-geb/src/testFixtures/resources/docker-java.properties b/grails-geb/src/testFixtures/resources/docker-java.properties
@@ -0,0 +1,2 @@
+# Workaround for running Testcontainers 1.x with Docker 29.0.0+
+api.version=1.44
diff --git a/grails-profiles/web/skeleton/grails-app/controllers/@grails.codegen.defaultPackage.path@/UrlMappings.groovy b/grails-profiles/web/skeleton/grails-app/controllers/@grails.codegen.defaultPackage.path@/UrlMappings.groovy
@@ -3,6 +3,7 @@ package @grails.codegen.defaultPackage@
 class UrlMappings {
 
     static mappings = {
+        "/$namespace/$controller/$action?/$id?(.$format)?" {}
         "/$controller/$action?/$id?(.$format)?"{
             constraints {
                 // apply constraints here
diff --git a/grails-profiles/web/skeleton/grails-app/views/index.gsp b/grails-profiles/web/skeleton/grails-app/views/index.gsp
@@ -71,7 +71,7 @@
                 <ul>
                     <g:each var="c" in="${grailsApplication.controllerClasses.sort { it.fullName } }">
                         <li class="controller">
-                            <g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link>
+                            <g:link namespace="${c.namespace}" controller="${c.logicalPropertyName}">${c.fullName}</g:link>
                         </li>
                     </g:each>
                 </ul>
diff --git a/grails-test-examples/geb/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy b/grails-test-examples/geb/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy
@@ -44,7 +44,10 @@ class PerTestRecordingSpec extends ContainerGebSpec {
     void '(setup) running a second test to create another recording'() {
         when: 'visiting another page than the previous test'
         to(UploadPage)
-        
+
+        and: 'pausing so we can see the page change in the video'
+        Thread.sleep(500)
+
         then: 'the page loads correctly'
         title == 'Upload Test'
     }
@@ -77,13 +80,14 @@ class PerTestRecordingSpec extends ContainerGebSpec {
         recordingDir != null
 
         when: 'getting all video recording files (mp4 or flv) from the recording directory'
-        def recordingFiles = recordingDir?.listFiles({ File file ->
-            isVideoFile(file) && file.name.contains(this.class.simpleName)
-        } as FileFilter)
+        def minFileCount = 2 // At least 2 files for the first two test methods
+        def recordingFiles = waitForRecordingFiles(recordingDir, this.class.simpleName, minFileCount)
+        def names = recordingFiles*.name.join('\n')
 
         then: 'recording files should exist for each test method'
-        recordingFiles != null
-        recordingFiles.length >= 2 // At least 2 files for the first two test methods
+        recordingFiles.length >= minFileCount
+        names.contains('setup_running_a_test_to_create_a_recording')
+        names.contains('setup_running_a_second_test_to_create_another')
 
         and: 'the recording files should have different content'
         // Sort by last modified time to get the most recent files
@@ -96,4 +100,26 @@ class PerTestRecordingSpec extends ContainerGebSpec {
     private static boolean isVideoFile(File file) {
         file.isFile() && (file.name.endsWith('.mp4') || file.name.endsWith('.flv'))
     }
+
+    private static File[] waitForRecordingFiles(
+            File recordingDir,
+            String testClassName,
+            int minFileCount = 2,
+            long timeoutMillis = 10_000L,
+            long pollIntervalMillis = 500L
+    ) {
+        long deadline = System.currentTimeMillis() + timeoutMillis
+        File[] recordingFiles = []
+        while (System.currentTimeMillis() < deadline) {
+            recordingFiles = recordingDir.listFiles({ file ->
+                isVideoFile(file) && file.name.contains(testClassName)
+            } as FileFilter) ?: [] as File[]
+
+            if (recordingFiles.length >= minFileCount) {
+                break
+            }
+            sleep(pollIntervalMillis)
+        }
+        return recordingFiles
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class PublishPlugin implements Plugin<Project> {`
`183`	`183`	`it.url.set('https://apache.org/')`
`184`	`184`	`}`
`185`	`185`	`it.developers.set(project.provider { lookupProperty(project, 'pomDevelopers', determineDevelopers(project))})`
`186`		`- it.pomCustomization = lookupProperty(project, 'pomCustomization') as Closure`
	`186`	`+ it.pomCustomization.set(project.provider { lookupProperty(project, 'pomCustomization') as Closure })`
`187`	`187`	`it.publishTestSources.set(project.provider { lookupProperty(project, 'pomPublishTestSources', false)})`
`188`	`188`	`it.testRepositoryPath.set(project.provider { shouldSkipJavaComponent(project) ? null : findRootGrailsCoreDir(project).dir('build/local-maven')})`
`189`	`189`	`it.publicationName.set(project.provider { lookupProperty(project, 'pomMavenPublicationName', 'maven')})`
Original file line number	Diff line number	Diff line change
@@ -224,10 +224,11 @@ To apply and configure the `gradle-jakartaee-migration-plugin` in your `build.gr
`224`	`224`	`.build.gradle`
`225`	`225`	`----`
`226`	`226`	`plugins {`
`227`		`- id 'com.netflix.nebula.jakartaee-migration' version '0.24.0'`
	`227`	`+ id 'com.netflix.nebula.jakartaee-migration' version '1.0.0'`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`jakartaeeMigration {`
	`231`	`+ includeTransform('org.grails.plugins:export')`
`231`	`232`	`migrate()`
`232`	`233`	`}`
`233`	`234`	`----`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Workaround for running Testcontainers 1.x with Docker 29.0.0+`
	`2`	`+api.version=1.44`