Merge branch '7.1.x' into 8.0.x

# Conflicts:
#	grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

Author: jamesfredley

.github/workflows/gradle.yml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17, 21, 24 ]
+        java: [ 17, 21, 25 ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -156,7 +156,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17, 21, 24 ]
+        java: [ 17, 21, 25 ]
     runs-on: ubuntu-24.04
     steps:
       - name: "Output Agent IP" # in the event RAO blocks this agent, this can be used to debug it

.github/workflows/groovy-joint-workflow.yml

@@ -152,9 +152,6 @@ jobs:
         with:
           path: ~/.m2/repository
           key: cache-local-maven-${{ github.sha }}
-      - name: "🪶 Add mavenLocal repository to build"
-        run: |
-          sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' settings.gradle
       - name: 'Swap Groovy Version'
         run: |
           sed -i "/['\"]groovy\.version['\"][[:space:]]*:/c\'groovy.version':'${{ needs.build_groovy.outputs.groovyVersion }}'," dependencies.gradle
@@ -163,3 +160,5 @@ jobs:
           ./gradlew build
           -x groovydoc
           -PskipCodeStyle
+        env:
+          GRAILS_INCLUDE_MAVEN_LOCAL: true

.github/workflows/release-notes.yml

@@ -29,7 +29,7 @@ on:
   workflow_dispatch:
 # queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: release-pipeline
   cancel-in-progress: false
 jobs:
   update_release_draft:

.github/workflows/release.yml

@@ -37,6 +37,9 @@ env:
   TAG: ${{ github.event.release.tag_name }}
   TARGET_BRANCH: ${{ github.event.release.target_commitish }}
   VERSION: will be computed in each job
+concurrency:
+  group: release-pipeline
+  cancel-in-progress: false
 jobs:
   publish:
     name: "Stage Jar Files"
@@ -664,6 +667,8 @@ jobs:
           echo "::group::Add version to the Grails Website - MANUAL"
           echo "Add the released version [${VERSION}] to the Grails Website by running the Release workflow:"
           echo "https://github.com/apache/grails-static-website/actions/workflows/release.yml"
+          echo "Republish Grails Website by running the Publish workflow:"
+          echo "https://github.com/apache/grails-static-website/actions/workflows/publish.yml"
           echo "::endgroup::"
       - name: '📧 Announcement Email'
         run: |

.idea/codeStyles/Project.xml

@@ -1,3 +1,3 @@
 java=17.0.17-librca
-gradle=8.14.3
+gradle=8.14.4
 

.sdkmanrc

@@ -91,6 +91,10 @@ By default, the Grails CLI uses standard maven repos to retrieve upstream Grails
 
         export GRAILS_REPO_URL=$HOME/.m2/repository
 
+This variable also supports multiple repositories by using the separator ';'.  For example:
+
+        export GRAILS_REPO_URL=$HOME/.m2/repository;https://repo1.maven.org/maven2/
+
 The CLI distributions are located under the `grails-forge/grails-cli` project.  The build directory contains the CLI distribution, which can be used to create a Grails Application. Unzip it to any location, for the purposes of this document, we will use `grails-forge/grails-cli/build/distributions` as the working directory.
 
         cd grails-forge/grails-cli/build/distributions

INSTALL

@@ -405,7 +405,7 @@ In the event that artifacts differ, simply copy them to your project directory a
 
 ```bash
     cd ~/project
-    rsync -av grails-verify/grails/etc/bin/results/ etc/bin/results/
+    rsync -av ../grails-verify/grails/etc/bin/results/ etc/bin/results/
 ```
 
 # Appendix: Versioning

RELEASE.md

@@ -26,7 +26,7 @@ import groovy.transform.ToString
 @EqualsAndHashCode(includes = ['groupId', 'artifactId'])
 @CompileStatic
 @ToString
-class CoordinateHolder {
+class CoordinateHolder implements Serializable {
 
     String groupId
     String artifactId

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

@@ -43,4 +43,14 @@ class CoordinateVersionHolder extends CoordinateHolder {
 
         "$groupId:$artifactId:$version" as String
     }
+    
+    static CoordinateVersionHolder create(String coordinates) {
+        coordinates.split(':').with { String[] parts ->
+            new CoordinateVersionHolder(
+                groupId: parts[0],
+                artifactId: parts[1],
+                version: parts[2]
+            )
+        }
+    }
 }