Merge branch '7.0.x' into renovate/major-spring-core

.github/workflows/gradle.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['11', '14']
+        java: ['17']
     env:
       WORKSPACE: ${{ github.workspace }}
     steps:
@@ -47,11 +47,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_TOKEN }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Publish Artifacts (repo.grails.org)
         id: publish
         uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3

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

@@ -43,14 +43,14 @@ jobs:
           distribution: 'adopt'
           java-version: '11.0.6'
       - name: Cache local Maven repository & Groovy
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@v4
         with:
           path: |
             ~/groovy
             ~/.m2/repository
           key: cache-local-groovy-maven-${{ github.sha }}
       - 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.')
+        if: startsWith(github.ref, 'refs/heads/7.') || startsWith(github.base_ref, '7.') || 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
         id: groovy-version
@@ -101,7 +101,7 @@ jobs:
           # Add Gradle Enterprise set-up related configuration after line no 20 in settings.gradle
           echo "${{ steps.ge_conf.outputs.value}}" | sed -i -e "20r /dev/stdin" settings.gradle
       - name: Build and install groovy (no docs)
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3
+        uses: gradle/gradle-build-action@v3
         env:
           GRADLE_SCANS_ACCEPT: yes
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
@@ -128,9 +128,9 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Cache local Maven repository & Groovy
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+        uses: actions/cache@v4
         with:
           path: |
             ~/groovy
@@ -141,7 +141,7 @@ jobs:
           echo "CI_GROOVY_VERSION=${{needs.build_groovy.outputs.groovyVersion}}" >> $GITHUB_ENV
       - name: Build Grails
         id: build_grails
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3
+        uses: gradle/gradle-build-action@v3
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Extract Target Branch
         id: extract_branch
         run: |

.github/workflows/retry-release.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: Extract Target Branch
         id: extract_branch
         run: |

build.gradle

@@ -434,8 +434,8 @@ subprojects { project ->
     if (project.name == 'grails-dependencies') return
     if (project.name == 'grails-bom') return
 
-    sourceCompatibility = "1.11"
-    targetCompatibility = "1.11"
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     if (project.name =~ /^(grails-web|grails-plugin-|grails-test-suite|grails-test)/) {
         dependencies {
@@ -523,11 +523,17 @@ subprojects { project ->
         }
     }
 
-    def debugArguments = ['-Xmx2g', '-Xdebug', '-Xnoagent', '-Djava.compiler=NONE',
-                          '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
-
-    tasks.withType(Test) {
+    def debugArguments = [
+            '-Xmx2g', '-Xdebug', '-Xnoagent', '-Djava.compiler=NONE',
+            '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'
+    ]
+    def java17moduleReflectionCompatibilityArguments = [
+            '--add-opens=java.base/java.lang=ALL-UNNAMED',
+            '--add-opens=java.base/java.util=ALL-UNNAMED'
+    ]
+    tasks.withType(Test).configureEach {
         useJUnitPlatform()
+        jvmArgs += java17moduleReflectionCompatibilityArguments
     }
 
     test {
@@ -555,15 +561,15 @@ subprojects { project ->
         } else {
             maxHeapSize = '1024m'
         }
-        if (System.getProperty("debug.tests")) {
-            jvmArgs debugArguments
+        if(System.getProperty("debug.tests")) {
+            jvmArgs += debugArguments
         }
     }
 
     task singleTest(type: Test) {
         // task for running a single test with -DsingleTest.single=TestName singleTest
-        if (System.getProperty("debug.tests")) {
-            jvmArgs debugArguments
+        if(System.getProperty("debug.tests")) {
+            jvmArgs += debugArguments
         }
     }
 

gradle.properties

@@ -1,8 +1,8 @@
-projectVersion=6.2.1-SNAPSHOT
+projectVersion=7.0.0-SNAPSHOT
 antVersion=1.10.14
 aspectjVersion=1.9.22
 asyncVersion=5.0.2
-caffeineVersion=2.9.3
+caffeineVersion=3.1.8
 cglibVersion=2.2.2
 commonsLangVersion=2.6
 datastoreVersion=8.1.2
@@ -17,7 +17,7 @@ h2.version=2.2.224
 h2Version=2.2.224
 hibernateDatastoreVersion=8.1.0
 jakartaAnnotationApiVersion=2.0.0
-jansiVersion=1.18
+jansiVersion=2.4.1
 javaParserCoreVersion=3.25.9
 javaxAnnotationApiVersion=1.3.2
 jaxbApiVersion=2.3.1
@@ -42,8 +42,8 @@ spockVersion=2.1-groovy-3.0
 springBootVersion=2.7.18
 springLoadedVersion=1.2.8.RELEASE
 springVersion=6.1.6
-testingSupportVersion=3.2.1
-testingSupportVersionForTests=3.2.1
+testingSupportVersion=3.2.2
+testingSupportVersionForTests=3.2.2
 tomcatLog4jVersion=8.5.2
 tomcatVersion=9.0.87
 viewsVersion=3.2.3