test(ci): add indy matrix to functional test CI jobs

.github/workflows/gradle.yml

@@ -136,11 +136,12 @@ jobs:
           -PonlyCoreTests
           -PskipCodeStyle
   buildForge:
-    name: "Build Grails Forge"
+    name: "Build Grails Forge (Java ${{ matrix.java }}, indy=${{ matrix.indy }})"
     strategy:
       fail-fast: false
       matrix:
         java: [ 17, 21 ]
+        indy: [ false, true ]
     runs-on: ubuntu-24.04
     steps:
       - name: "Output Agent IP" # in the event RAO blocks this agent, this can be used to debug it
@@ -163,6 +164,7 @@ jobs:
           ./gradlew build
           --continue
           --stacktrace
+          -PgrailsIndy=${{ matrix.indy }}
           -PskipCodeStyle
           -PskipTests
       - name: "🔨 Build project with tests"
@@ -173,6 +175,7 @@ jobs:
           --continue
           --rerun-tasks
           --stacktrace
+          -PgrailsIndy=${{ matrix.indy }}
           -PskipCodeStyle
       - name: "✅ Verify combined CLI"
         run: |
@@ -183,20 +186,21 @@ jobs:
           ./tmp1/cli/bin/grails --version
           ./tmp1/cli/bin/grails-forge-cli --version
       - name: "📤 Upload CLI Zip to Workflow Summary Page"
-        if: ${{ matrix.java == '17' }}
+        if: ${{ matrix.java == '17' && matrix.indy == false }}
         uses: actions/upload-artifact@v6
         with:
           name: 'apache-grails-SNAPSHOT-bin.zip'
           include-hidden-files: true
           path: grails-forge/tmp1/cli/**/*
           if-no-files-found: 'error'
   functional:
-    name: "Functional Tests"
+    name: "Functional Tests (Java ${{ matrix.java }}, indy=${{ matrix.indy }})"
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
     strategy:
       fail-fast: false
       matrix:
         java: [ 17, 21, 25 ]
+        indy: [ false, true ]
     runs-on: ubuntu-24.04
     steps:
       - name: "Output Agent IP" # in the event RAO blocks this agent, this can be used to debug it
@@ -219,19 +223,21 @@ jobs:
           --rerun-tasks
           --stacktrace
           -PgebAtCheckWaiting
+          -PgrailsIndy=${{ matrix.indy }}
           -PonlyFunctionalTests
           -PskipCodeStyle
           -PskipHibernate5Tests
           -PskipMongodbTests
   mongodbFunctional:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
-    name: "Mongodb Functional Tests"
+    name: "Mongodb Functional Tests (Java ${{ matrix.java }}, MongoDB ${{ matrix.mongodb-version }}, indy=${{ matrix.indy }})"
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         java: [ 17, 25 ]
         mongodb-version: [ '7.0', '8.0' ] # test with supported versions https://www.mongodb.com/legal/support-policy/lifecycles
+        indy: [ false, true ]
     steps:
       - name: "Output Agent IP" # in the event RAO blocks this agent, this can be used to debug it
         run: curl -s https://api.ipify.org
@@ -254,17 +260,19 @@ jobs:
           --continue
           --rerun-tasks
           --stacktrace
+          -PgrailsIndy=${{ matrix.indy }}
           -PonlyMongodbTests
           -PmongodbContainerVersion=${{ matrix.mongodb-version }}
           -PskipCodeStyle
   hibernate5Functional:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
-    name: "Hibernate5 Functional Tests"
+    name: "Hibernate5 Functional Tests (Java ${{ matrix.java }}, indy=${{ matrix.indy }})"
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         java: [ 17, 25 ]
+        indy: [ false, true ]
     steps:
       - name: "Output Agent IP" # in the event RAO blocks this agent, this can be used to debug it
         run: curl -s https://api.ipify.org
@@ -287,6 +295,7 @@ jobs:
           --continue
           --rerun-tasks
           --stacktrace
+          -PgrailsIndy=${{ matrix.indy }}
           -PonlyHibernate5Tests
           -PskipCodeStyle
   publishGradle:

gradle/grails-extension-gradle-config.gradle

@@ -31,4 +31,11 @@ grails {
     // this means you MUST publish locally via ./gradlew :grails-bom:publishMavenPublicationToLocalBomRepository
     // this causes unexpected version mismatches in the various plugin projects
     springDependencyManagement = false
+
+    // Allow CI to toggle Groovy invokedynamic (indy) via -PgrailsIndy=true
+    // This enables testing functional tests with both indy enabled and disabled.
+    // See: https://github.com/apache/grails-core/issues/15321
+    if (project.hasProperty('grailsIndy')) {
+        indy = Boolean.parseBoolean(project.property('grailsIndy') as String)
+    }
 }