Merge 7.x (with spring security / mail / redis ) into 8.x

.claude/settings.json

@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "mcp__claude_ai_Atlassian_Rovo__getJiraIssue",
+      "mcp__claude_ai_Atlassian_Rovo__searchJiraIssuesUsingJql",
+      "mcp__claude_ai_Atlassian_Rovo__lookupJiraAccountId",
+      "mcp__excel__read_data_from_excel",
+      "mcp__excel__get_workbook_metadata",
+      "mcp__lens__list-clusters",
+      "mcp__lens__prometheus-execute-query"
+    ]
+  }
+}

.git-blame-ignore-revs

@@ -2,4 +2,10 @@
 # Reformat code: https://github.com/apache/grails-core/pull/14925
 20c3278683f2993e23c947c409eafa978c0aefb7
 # Reformat code for hibernate 7
-811bacd377678e22bac6308065da28b1caa17700
+811bacd377678e22bac6308065da28b1caa17700
+# Redis code import required reformatting
+b5ad26220c96276d309ad8b90a8c1be958a1e0c5
+# mail code import required reformatting
+a0cd977e1b30c9e5d63dac5f073f0507b38657b7
+# spring security reformatting
+824362eb6c4c4874fc5cbcb4f69b83c390215691

.github/workflows/gradle.yml

@@ -18,7 +18,6 @@ on:
   push:
     branches:
       - '[0-9]+.[0-9]+.x'
-      - '8.0.x-hibernate7.*'
   pull_request:
   workflow_dispatch:
 # Queue jobs - cancel in-progress PR runs when new commits pushed, but allow branch builds to complete
@@ -283,13 +282,128 @@ jobs:
           --continue
           --rerun-tasks
           --stacktrace
-          -PgebAtCheckWaiting
           -PgrailsIndy=${{ matrix.indy }}
           -PonlyFunctionalTests
           -PskipCodeStyle
           -PskipHibernate5Tests
           -PskipHibernate7Tests
           -PskipMongodbTests
+          -PskipSpringSecurityTests
+          -PskipRedisTests
+      - name: "📤 Upload Geb Reports"
+        if: failure()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: geb-reports-functional-java${{ matrix.java }}-indy${{ matrix.indy }}
+          path: '**/build/geb-reports/'
+          if-no-files-found: ignore
+  security:
+    name: "Spring Security Tests"
+    if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 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
+        run: curl -s https://api.ipify.org
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        with:
+          distribution: liberica
+          java-version: ${{ matrix.java }}
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
+        with:
+          cache-provider: basic # 'basic' uses the MIT-licensed, open-source cache provider; the default 'enhanced' provider (v6+) is proprietary (Gradle commercial Terms of Use)
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY  }}
+      - name: "🔍 Setup TestLens"
+        uses: testlens-app/setup-testlens@d96a555133c275a00949d2cc77b70fe9a4242ebf # v1.9.2
+      - name: "🏃 Run Functional Tests"
+        run: >
+          ./gradlew bootJar check
+          --continue
+          --rerun-tasks
+          --stacktrace
+          -PonlySpringSecurityTests
+          -PskipCodeStyle
+  securityConfig:
+    name: "Spring Security Config Functional Tests"
+    if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # Each value boots the core functional-test-app with a different Spring Security configuration.
+        # The specs are gated with @IgnoreIf({ System.getProperty('TESTCONFIG') != '<config>' }), so a
+        # config only runs when TESTCONFIG matches. TESTCONFIG is applied at app startup, so every config
+        # must be its own run. Carried over from the standalone grails-spring-security CI — do not drop
+        # configs (add, don't remove) when the app's security configurations change.
+        test-config: [ 'static', 'annotation', 'requestmap', 'basic', 'basicCacheUsers', 'misc', 'putWithParams', 'bcrypt', 'issue503' ]
+    runs-on: ubuntu-24.04
+    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
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        with:
+          distribution: liberica
+          java-version: 21
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
+        with:
+          cache-provider: basic # 'basic' uses the MIT-licensed, open-source cache provider; the default 'enhanced' provider (v6+) is proprietary (Gradle commercial Terms of Use)
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY  }}
+      - name: "🔍 Setup TestLens"
+        uses: testlens-app/setup-testlens@d96a555133c275a00949d2cc77b70fe9a4242ebf # v1.9.2
+      - name: "🏃 Run Spring Security Functional Tests (TESTCONFIG=${{ matrix.test-config }})"
+        run: >
+          ./gradlew
+          :grails-test-examples-spring-security-core-functional-test-app:check
+          --continue
+          --rerun-tasks
+          --stacktrace
+          -DTESTCONFIG=${{ matrix.test-config }}
+          -PskipCodeStyle
+  redis:
+    name: "Redis Tests"
+    if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 21, 25 ]
+        redis-version: [ '7.4', '8.0' ] # Redis container version exercised via Testcontainers
+    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
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        with:
+          distribution: liberica
+          java-version: ${{ matrix.java }}
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
+        with:
+          cache-provider: basic # 'basic' uses the MIT-licensed, open-source cache provider; the default 'enhanced' provider (v6+) is proprietary (Gradle commercial Terms of Use)
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY  }}
+      - name: "🔍 Setup TestLens"
+        uses: testlens-app/setup-testlens@d96a555133c275a00949d2cc77b70fe9a4242ebf # v1.9.2
+      - name: "🏃 Run Redis Tests"
+        run: >
+          ./gradlew bootJar check
+          --continue
+          --rerun-tasks
+          --stacktrace
+          -PonlyRedisTests
+          -PredisContainerVersion=${{ matrix.redis-version }}
+          -PskipCodeStyle
   mongodbFunctional:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
     name: "Mongodb Functional Tests (Java ${{ matrix.java }}, MongoDB ${{ matrix.mongodb-version }}, indy=${{ matrix.indy }})"
@@ -454,17 +568,20 @@ jobs:
           name: grails-gradle-artifacts.txt
           path: grails-gradle/build/grails-gradle-artifacts.txt
   publish:
-    needs: [ publishGradle, build, functional, hibernate5Functional, hibernate7Functional, mongodbFunctional ]
+    needs: [ publishGradle, build, functional, security, securityConfig, redis, hibernate5Functional, hibernate7Functional, mongodbFunctional ]
     if: >-
-      ${{ always() && 
-          github.repository_owner == 'apache' && 
-          (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && 
-          needs.publishGradle.result == 'success' && 
-          (needs.build.result == 'success' || needs.build.result == 'skipped') && 
-          (needs.functional.result == 'success' || needs.functional.result == 'skipped') && 
+      ${{ always() &&
+          github.repository_owner == 'apache' &&
+          (github.event_name == 'push' || github.event_name == 'workflow_dispatch') &&
+          needs.publishGradle.result == 'success' &&
+          (needs.build.result == 'success' || needs.build.result == 'skipped') &&
+          (needs.functional.result == 'success' || needs.functional.result == 'skipped') &&
+          (needs.security.result == 'success' || needs.security.result == 'skipped') &&
+          (needs.securityConfig.result == 'success' || needs.securityConfig.result == 'skipped') &&
+          (needs.redis.result == 'success' || needs.redis.result == 'skipped') &&
           (needs.hibernate5Functional.result == 'success' || needs.hibernate5Functional.result == 'skipped') &&
           (needs.hibernate7Functional.result == 'success' || needs.hibernate7Functional.result == 'skipped') &&
-          (needs.mongodbFunctional.result == 'success' || needs.mongodbFunctional.result == 'skipped') 
+          (needs.mongodbFunctional.result == 'success' || needs.mongodbFunctional.result == 'skipped')
       }}
     runs-on: ubuntu-24.04
     steps:

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

@@ -147,7 +147,6 @@ jobs:
           --continue
           --stacktrace
           -x groovydoc
-          -PgebAtCheckWaiting
           -PskipCodeStyle
           -PskipMicronautProjects
           -PmaxTestParallel=3

.github/workflows/sitemesh2.yml

@@ -118,7 +118,6 @@ jobs:
           --continue
           --rerun-tasks
           --stacktrace
-          -PgebAtCheckWaiting
           -PgrailsIndy=${{ matrix.indy }}
           -PonlyFunctionalTests
           -PskipCodeStyle

DEVELOPMENT.md

@@ -37,13 +37,17 @@ These can be set on the command line like so:
 * `onlyHibernate5Tests` - runs only a hibernate5 related test
 * `onlyHibernate7Tests` - runs only a hibernate7 related test
 * `onlyMongodbTests` - runs only a mongodb related test
+* `onlyRedisTests` - runs only redis related tests
+* `onlySpringSecurityTests` - runs only spring security related tests
 * `serializeMongoTests` - if true, only integration tests from one mongo project will run at a time
 * `skipCodeStyle` - does not run code style checks
 * `skipCoreTests` - does not run the "core" tests
 * `skipFunctionalTests` - does not run the functional tests
 * `skipHibernate5Tests` - does not run hibernate5 related tests
 * `skipHibernate7Tests` - does not run hibernate7 related tests
 * `skipMongodbTests` - does not run mongo related tests
+* `skipRedisTests` - does not run redis related tests
+* `skipSpringSecurityTests` - does not run spring security related tests
 * `skipTests` - no tests will run
 
 ## Test slicing

LICENSE

@@ -241,4 +241,15 @@ licensed under the OpenSymphony Software License, Version 1.1.
 
 See licenses/LICENSE-opensymphony.txt for the full license terms.
 
---------------------------------------------------------------------------
+--------------------------------------------------------------------------
+
+The following files are licensed under the MIT:
+
+    grails-spring-security/ui/plugin/grails-app/assets/javascripts/jquery/jquery.jdMenu.js
+    grails-spring-security/ui/plugin/grails-app/assets/javascripts/jquery/jquery.positionBy.js
+    grails-spring-security/ui/plugin/grails-app/assets/stylesheets/jquery.jdMenu.slate.css
+    grails-spring-security/ui/plugin/grails-app/assets/stylesheets/jquery.jdMenu.css
+
+See licenses/LICENSE-MIT.txt for the full license terms.
+
+--------------------------------------------------------------------------

RENAME.md

@@ -112,6 +112,7 @@ Below is a reference of all migrated artifacts - both their old and new name.
 | org.grails                        | grails-logging                                  | org.apache.grails                               | grails-logging                                                |                        |                        | grails-core            |
 | org.grails                        | grails-plugin-i18n                              | org.apache.grails.i18n                          | grails-i18n                                                   |                        |                        | grails-core            |
 | org.grails                        | grails-plugin-interceptors                      | org.apache.grails                               | grails-interceptors                                           |                        |                        | grails-core            |
+| org.grails.plugins                | grails-mail                                     | org.apache.grails                               | grails-mail                                                  |                        |                        | grails-mail            |
 | org.grails                        | grails-plugin-mimetypes                         | org.apache.grails                               | grails-mimetypes                                              |                        |                        | grails-core            |
 | org.grails.plugins                | quartz                                          | org.apache.grails                               | grails-quartz                                                 |                        |                        | grails-quartz          |
 | org.grails.plugins                | grails-redis                                    | org.apache.grails                               | grails-redis                                                  |                        |                        | grails-redis           |
@@ -129,7 +130,7 @@ Below is a reference of all migrated artifacts - both their old and new name.
 | org.grails.plugins                | spring-security-oauth2                          | org.apache.grails                               | grails-spring-security-oauth2                                 |                        |                        | grails-spring-security |
 | org.grails.plugins                | spring-security-rest                            | org.apache.grails                               | grails-spring-security-rest                                   |                        |                        | grails-spring-security |
 | org.grails.plugins                | spring-security-rest-gorm                       | org.apache.grails                               | grails-spring-security-rest-datamapping                       |                        |                        | grails-spring-security |
-| org.grails.plugins                | spring-security-rest-grailscache                | org.apache.grails                               | grails-spring-security-grails-cache                           |                        |                        | grails-spring-security |
+| org.grails.plugins                | spring-security-rest-grailscache                | org.apache.grails                               | grails-spring-security-rest-grailscache                       |                        |                        | grails-spring-security |
 | org.grails.plugins                | spring-security-rest-memcached                  | org.apache.grails                               | grails-spring-security-rest-memcached                         |                        |                        | grails-spring-security |
 | org.grails.plugins                | spring-security-rest-redis                      | org.apache.grails                               | grails-spring-security-rest-redis                             |                        |                        | grails-spring-security |
 | org.grails.plugins                | spring-security-ui                              | org.apache.grails                               | grails-spring-security-ui                                     |                        |                        | grails-spring-security |

build-logic/docs-core/build.gradle

@@ -102,6 +102,8 @@ tasks.withType(Test).configureEach {
                 'onlyHibernate5Tests',
                 'onlyHibernate7Tests',
                 'onlyMongodbTests',
+                'onlyRedisTests',
+                'onlySpringSecurityTests',
                 'skipCoreTests',
                 'skipTests'
         ].find {

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/PublishPlugin.groovy

@@ -261,23 +261,32 @@ class PublishPlugin implements Plugin<Project> {
             emeritus('basecamp', 'Joshua Burnett', project),
             emeritus('bluesliverx','Brian Saville', project),
             emeritus('bobbywarner', 'Bobby Warner', project),
+            emeritus('briancoles', 'Brian Coles', project),
             emeritus('burtbeckwith', 'Burt Beckwith', project),
+            emeritus('candrews', 'Craig Andrews', project),
             emeritus('davidkron', 'David Kron', project),
+            emeritus('davidseiler', 'David Seiler', project),
             emeritus('delight', 'Konstantinos Kostarellis', project),
             emeritus('erawat','Erawat Chamanont', project),
             emeritus('erichelgeson','Eric Helgeson', project),
+            emeritus('florianlangenhahn', 'Florian Langenhahn', project),
             emeritus('fordguo','Ford Guo', project),
+            emeritus('germansancho', 'German Sancho', project),
             emeritus('houbie','Ivo Houbrechts', project),
             emeritus('jameskleeh', 'James Kleeh', project),
             emeritus('jbrisbin','Jon Brisbin', project),
             emeritus('jeffscottbrown', 'Jeff Brown', project),
+            emeritus('johnengelman', 'John Engelman', project),
+            emeritus('johnmulhern', 'John Mulhern', project),
+            emeritus('jordonsaardchit', 'Jordon Saardchit', project),
             emeritus('jrudolph','Jason Rudolph', project),
             emeritus('k4zuki', 'Kazuki Yamamoto', project),
             emeritus('leebutts','Lee Butts', project),
             emeritus('longwa','Aaron Long', project),
             emeritus('ilopmar', 'Iván López', project),
             emeritus('marceloverdijk','Marcel Overdijk', project),
             emeritus('marcpalmer', 'Marc Palmer', project),
+            emeritus('michaelcameron', 'Michael Cameron', project),
             emeritus('mpccolorado','Martín Caballero', project),
             emeritus('nebolsin','Sergey Nebolsin', project),
             emeritus('niravassar','Nirav Assar', project),
@@ -291,6 +300,7 @@ class PublishPlugin implements Plugin<Project> {
             emeritus('rstepanenko','Roman Stepanenko', project),
             emeritus('rvanderwerf','Ryan Vanderwerf', project),
             emeritus('sarmbruster', 'Stefan Armbruster', project),
+            emeritus('shaunjurgemeyer', 'Shaun Jurgemeyer', project),
             emeritus('smaldini','Stephane Maldini', project),
             emeritus('tkvw','Dennie de Lange', project),
             emeritus('tomwidmer','Tom Widmer', project),
@@ -304,6 +314,7 @@ class PublishPlugin implements Plugin<Project> {
             contributor('JudeRV', 'judevargas22@gmail.com', project),
             contributor('acanby', 'Andrew Canby', project),
             contributor('aeisenberg', 'Andrew Eisenberg', project),
+            contributor('aitmanas', 'Aidas', project),
             contributor('and-dmitry', 'Dmitry Andreychuk', project),
             contributor('andersaaberg', 'Anders Aaberg', project),
             contributor('aulea', 'Alar Aule', project),
@@ -328,6 +339,7 @@ class PublishPlugin implements Plugin<Project> {
             contributor('jprinet', 'Jérôme Prinet', project),
             contributor('jwagenleitner', 'John Wagenleitner', project),
             contributor('lucastex', 'Lucas Frare Teixeira', project),
+            contributor('matrixcrawler', 'Johannes Brunswicker', project),
             contributor('mburak', 'Matias Burak', project),
             contributor('micfra', 'Michael Frankfurter', project),
             contributor('mikea', 'Mike Aizatsky', project),