Merge branch '6.1.x' into 6.2.x

 Conflicts:
	.github/workflows/groovy-joint-workflow.yml
	.github/workflows/release.yml
	build.gradle
	gradle.properties
	grails-bom/plugins.properties
	grails-core/src/test/groovy/grails/util/GrailsUtilTests.java
	grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy
	grails-docs/build.gradle
	grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy
	grails-test-suite-persistence/build.gradle
	grails-test-suite-uber/build.gradle
	grails-test-suite-web/build.gradle
	settings.gradle

Author: jdaugherty

.github/workflows/gradle.yml

@@ -31,8 +31,6 @@ jobs:
         uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
-          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
           arguments: build groovydoc
   publish:
@@ -55,8 +53,6 @@ jobs:
         uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
-          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         with:

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

@@ -52,11 +52,10 @@ jobs:
       - name: Checkout Groovy 3_0_X (Grails 5 and later)
         if: startsWith(github.ref, 'refs/heads/6.') || startsWith(github.base_ref, '6.') || startsWith(github.ref, 'refs/heads/5.') || startsWith(github.base_ref, '5.')
         run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
-      - name: Set CI_GROOVY_VERSION for Grails
+      - name: Get Groovy version for Grails
         id: groovy-version
         run: |
           cd ../groovy
-          echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 |  tr -d '[:space:]')" >> $GITHUB_ENV
           echo "value=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 |  tr -d '[:space:]')" >> $GITHUB_OUTPUT
       - name: Prepare GE Set-up Configuration
         id: ge_conf
@@ -130,7 +129,7 @@ jobs:
           distribution: 'adopt'
           java-version: '11'
       - name: Cache local Maven repository & Groovy
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
         with:
           path: |
             ~/groovy
@@ -143,10 +142,11 @@ jobs:
         id: build_grails
         uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3
         env:
+          ORG_GRADLE_PROJECT_groovyVersion: ${{ needs.build_groovy.outputs.groovyVersion }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
           arguments: |
             build 
-            -x groovydoc
+            -x groovydoc

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
       - name: Upload Distribution
         if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: grails-${{ steps.release_version.outputs.value }}.zip
           path: build/distributions/grails-${{ steps.release_version.outputs.value }}.zip

.github/workflows/retry-release.yml

@@ -49,8 +49,6 @@ jobs:
           arguments: assemble
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
-          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
       - name: Upload artifacts to the Github release
         id: upload_artifact
         if: steps.assemble.outcome == 'success'

build.gradle

@@ -30,7 +30,7 @@ ext {
     // When making changes in the dependencyVersions, remember to also update the Grails BOM Documentation:
     // https://docs.grails.org/snapshot/ref/Dependency%20Versions/Grails%20BOM.html
     dependencyVersions = [
-            'fieldsPlugin'           : [version: feildsPluginVersion,
+            'fieldsPlugin'           : [version: fieldsPluginVersion,
                                         group  : 'org.grails.plugins',
                                         names  : ['fields'],
                                         modules: ['']
@@ -223,14 +223,14 @@ if (isReleaseVersion) {
 
 allprojects {
     repositories {
-        mavenLocal()
+        mavenLocal() // Used by the Groovy Joint Validation Github workflow after building groovy locally in CI
         mavenCentral()
-        maven { url "https://repo.grails.org/grails/core" }
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url = "https://repo.grails.org/grails/core" }
+        maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
         if (groovyVersion.endsWith('-SNAPSHOT')) {
-            maven {
-                name 'JFrog OSS snapshot repo'
-                url 'https://oss.jfrog.org/oss-snapshot-local/'
+            maven { // Used for testing with Groovy snapshots locally
+                name = 'Groovy Snapshot repository'
+                url = 'https://groovy.jfrog.io/artifactory/libs-snapshot-local/'
             }
         }
     }

gradle.properties

@@ -7,7 +7,7 @@ cglibVersion=2.2.2
 commonsLangVersion=2.6
 datastoreVersion=8.1.2
 directoryWatcherVersion=0.9.9
-feildsPluginVersion=5.1.0-SNAPSHOT
+fieldsPluginVersion=5.1.0-SNAPSHOT
 gdocEngineVersion=1.0.1
 gradleNexusPluginVersion=2.3.1
 gradleNexusStagingPluginVersion=0.12.0
@@ -42,6 +42,7 @@ spockVersion=2.1-groovy-3.0
 springBootVersion=2.7.18
 springLoadedVersion=1.2.8.RELEASE
 springVersion=5.3.39
+spring.version=5.3.39
 testingSupportVersion=3.2.1
 testingSupportVersionForTests=3.2.2
 tomcatLog4jVersion=8.5.2

gradle/idea.gradle

@@ -1,3 +1,5 @@
+import groovy.xml.XmlParser
+
 idea {
     project {
         jdkName "1.7"

grails-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy

@@ -17,7 +17,7 @@ package grails.codegen.model
 
 import grails.util.GrailsNameUtils
 import groovy.transform.CompileStatic
-import org.codehaus.groovy.runtime.MetaClassHelper
+import org.apache.groovy.util.BeanUtils
 import org.grails.io.support.FileSystemResource
 import org.grails.io.support.GrailsResourceUtils
 import org.grails.io.support.Resource
@@ -89,7 +89,7 @@ trait ModelBuilder {
         final String packagePath
 
         ModelImpl(String className) {
-            this.className = MetaClassHelper.capitalize(GrailsNameUtils.getShortName(className))
+            this.className = BeanUtils.capitalize(GrailsNameUtils.getShortName(className))
             this.fullName = className
             this.propertyName = GrailsNameUtils.getPropertyName(className)
             this.packageName = GrailsNameUtils.getPackageName(className)
@@ -111,7 +111,14 @@ trait ModelBuilder {
 
         @Override
         Map<String, Object> asMap() {
-            (Map<String,Object>) [ className: className, fullName: fullName, propertyName: propertyName, modelName: propertyName, packageName: packageName, packagePath: packagePath, simpleName: simpleName, lowerCaseName: lowerCaseName]
+            [className: className,
+             fullName: fullName,
+             propertyName: propertyName,
+             modelName: propertyName,
+             packageName: packageName,
+             packagePath: packagePath,
+             simpleName: simpleName,
+             lowerCaseName: lowerCaseName] as Map<String, Object>
         }
     }
 

grails-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java

@@ -15,7 +15,7 @@
  */
 package org.grails.io.support;
 
-import groovy.util.XmlSlurper;
+import groovy.xml.XmlSlurper;
 import groovy.xml.FactorySupport;
 import org.xml.sax.SAXException;
 import javax.xml.XMLConstants;

grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy

@@ -16,12 +16,10 @@
 package grails.ui.shell.support
 
 import grails.core.GrailsApplication
-import grails.ui.support.DevelopmentWebApplicationContext
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 import org.springframework.context.support.GenericApplicationContext
 
-
 /**
  * @author Graeme Rocher
  * @since 3.0