Hibernate 7 Support

.editorconfig

@@ -23,4 +23,5 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 spaces_around_operators = true
-wildcard_import_limit = 999
+wildcard_import_limit = 999
+imports_layout = java.**, |, javax.**, |, groovy.**, org.apache.groovy.**, org.codehaus.groovy.**, |, jakarta.**, |, *, |, io.spring.**, org.springframework.**, |, grails.**, org.apache.grails.**, org.grails.**, |, $*

.git-blame-ignore-revs

@@ -1,3 +1,5 @@
 # .git-blame-ignore-revs
 # Reformat code: https://github.com/apache/grails-core/pull/14925
 20c3278683f2993e23c947c409eafa978c0aefb7
+# Reformat code for hibernate 7
+811bacd377678e22bac6308065da28b1caa17700

.github/workflows/codeql.yml

@@ -30,10 +30,12 @@ on:
   push:
     branches:
       - '[4-9]+.[0-9]+.x'
+      - '8.0.x-hibernate7.*'
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
       - '[4-9]+.[0-9]+.x'
+      - '8.0.x-hibernate7.*'
 # queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/codestyle.yml

@@ -18,6 +18,7 @@ on:
   push:
     branches:
       - '[0-9]+.[0-9]+.x'
+      - '8.0.x-hibernate7.*'
   pull_request:
   workflow_dispatch:
 # queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
@@ -43,18 +44,27 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🔎 Check Core Projects"
-        run: ./gradlew codeStyle
+        run: |
+          mkdir -p build/reports/codestyle
+          ./gradlew codeStyle --continue 2>&1 | tee build/codestyle-output.log || true
+          # Extract Spotless violations into a separate report
+          sed -n '/The following files had format violations:/,/Run.*spotlessApply.*to fix all violations\./p' build/codestyle-output.log > build/reports/codestyle/spotless-violations.txt || true
+          # Fail the step if the Gradle build actually failed
+          grep -q "BUILD SUCCESSFUL" build/codestyle-output.log
       - name: "📤 Upload Failure Reports"
         if: always()
         uses: actions/upload-artifact@v7.0.0
         with:
           name: core-reports
-          path: build/reports/codestyle/
+          path: |
+            build/reports/codestyle/
+            **/build/reports/pmd/
+            **/build/reports/spotbugs/
       - name: "📋 Publish Code Style Report in Job Summary"
         if: always()
         run: |
           echo "## 🔎 Code Style Report - Core Projects" >> $GITHUB_STEP_SUMMARY
-          for file in build/reports/codestyle/checkstyle/*.xml build/reports/codestyle/codenarc/*.xml; do
+          for file in build/reports/codestyle/spotless-violations.txt build/reports/codestyle/checkstyle/*.xml build/reports/codestyle/codenarc/*.xml; do
             [ -f "$file" ] || continue
             if grep -q "<error " "$file" || grep -q "<Violation " "$file"; then
               echo "### ❌ $(basename $file .xml)" >> $GITHUB_STEP_SUMMARY

.github/workflows/gradle.yml

@@ -18,6 +18,7 @@ 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

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

@@ -17,10 +17,12 @@ name: "CI - Groovy Joint Validation Build"
 on:
   push:
     branches:
-      - '[4-9]+.[0-9]+.x'
+      - '[0-9]+.[0-9]+.x'
+      - '8.0.x-hibernate7.*'
   pull_request:
     branches:
-      - '[4-9]+.[0-9]+.x'
+      - '[0-9]+.[0-9]+.x'
+      - '8.0.x-hibernate7.*'
   workflow_dispatch:
 # queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
 concurrency:

.github/workflows/rat.yml

@@ -17,14 +17,12 @@ name: "Licensing - RAT Report"
 on:
   push:
     branches:
-      - '[4-9]+.[0-9]+.x'
-      - '[3-9]+.[3-9]+.x'
-      - license-audit
+      - '[0-9]+.[0-9]+.x'
+      - '8.0.x-hibernate7.*'
   pull_request:
     branches:
-      - '[4-9]+.[0-9]+.x'
-      - '[3-9]+.[3-9]+.x'
-      - license-audit
+      - '[0-9]+.[0-9]+.x'
+      - '8.0.x-hibernate7.*'
   workflow_dispatch:
 # queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
 concurrency:

.gitignore

@@ -52,10 +52,16 @@ prodDb.mv.db
 testWatchedFile.properties
 _alternativeTable.gsp
 **/src/en/ref/Versions/Grails BOM.adoc
+**/src/en/ref/Versions/Grails BOM Hibernate5.adoc
+**/src/en/ref/Versions/Grails BOM Hibernate7.adoc
 stacktrace.log
 target
 tmp/
 !grails-fields/src/main/groovy/org/grails/scaffolding/registry/output
 !etc/bin
 etc/bin/results
 .vscode/
+STATE_SNAPSHOT.xml
+0_build_grails.txt
+*_VIOLATIONS.md
+/TEST_FAILURES.md

AGENTS.md

@@ -51,6 +51,9 @@ export GRADLE_OPTS="-Xms2G -Xmx5G"
 8. **No internal APIs in docs** - Only document public APIs; never reference internal or package-private classes and methods in user-facing documentation
 9. **Test via public APIs** - Tests must exercise behavior through the same APIs an end user calls; never invoke internal implementations, package-private methods, or bypass the public surface directly
 10. **Always review and extend tests** - Review existing unit and functional tests before making changes; every code change must include new or enhanced tests that cover the affected behavior
+11. **Every code touch must update all tests for the changed class** - When a class is modified, find and update every test that covers it — unit, integration, and TCK. Do not leave any existing test out of sync with the new code.
+12. **Clean violations before commit** - Before every automated commit, run `./gradlew clean aggregateStyleViolations test aggregateTestFailures --continue` from the root and ensure that `CHECKSTYLE_VIOLATIONS.md`, `CODENARC_VIOLATIONS.md`, `PMD_VIOLATIONS.md`, and `TEST_FAILURES.md` report no issues and are removed.
+13. **Mandatory test coverage** - Any class touched in a commit MUST be covered with tests that verify all behavior. You must run ALL tests in the affected module(s) and ensure they pass before committing.
 
 ## Available Skills
 
@@ -229,8 +232,10 @@ class MyService { }
 1. **Fork & branch** from the target release branch (e.g., `7.0.x`)
 2. **Run tests** before submitting: `./gradlew build --rerun-tasks`
 3. **Run code style checks**: `./gradlew codeStyle`
-4. **Squash commits** into a single meaningful commit message
-5. **Reference issues** in PR description (e.g., "Fixes #1234")
+4. **Clean style violations**: Before committing, run `./gradlew clean aggregateStyleViolations` from the root and ensure that `CHECKSTYLE_VIOLATIONS.md`, `CODENARC_VIOLATIONS.md`, and `PMD_VIOLATIONS.md` have no issues.
+5. **Verify test coverage**: Ensure any touched class is covered by tests verifying all behavior. You must run ALL tests in the affected module(s) and ensure they pass before submission.
+6. **Squash commits** into a single meaningful commit message
+6. **Reference issues** in PR description (e.g., "Fixes #1234")
 
 ### Review Process
 

CODE_OF_CONDUCT.md

@@ -1,3 +1,19 @@
+<!--
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 # Code of Conduct
 
 Apache Grails follows the ASF [Code of

NOTICE

@@ -24,6 +24,10 @@ http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
 This product includes software developed by the OpenSymphony Group (http://www.opensymphony.com/). It uses Sitemesh2,
 licensed under the OpenSymphony Software License, Version 1.1. See licenses/LICENSE-opensymphony.txt for the full license terms.
 
+Liquibase Hibernate Integration
+This product includes software developed by Liquibase.org (http://www.liquibase.org) and its contributors.
+Licensed under Apache License, Version 2.0.
+
 Spring Framework ORM Hibernate 5 Support
 This product includes software from the Spring Framework project (https://spring.io/projects/spring-framework),
 vendored from Spring Framework 6.2.x. These classes were removed in Spring Framework 7.0.

RENAME.md

@@ -66,14 +66,10 @@ Below is a reference of all migrated artifacts - both their old and new name.
 | org.grails.plugins                | hibernate5                                      | org.apache.grails                               | grails-data-hibernate5                                        |                        |                        | grails-data-mapping    |
 | org.grails.plugins                | database-migration                              | org.apache.grails                               | grails-data-hibernate5-dbmigration                            |                        |                        | grails-data-mapping    |
 | org.grails                        | gorm-hibernate5-spring-boot                     | org.apache.grails                               | grails-data-hibernate5-spring-boot                            |                        |                        | grails-data-mapping    |
-| org.grails.plugins                | hibernate6                                      | org.apache.grails                               | grails-data-hibernate6                                        |                        |                        | grails-data-hibernate6 |
-| org.grails.plugins                | database-migration                              | org.apache.grails                               | grails-data-hibernate6-dbmigration                            |                        |                        | grails-data-hibernate6 |
-| org.grails                        | gorm-hibernate6-spring-boot                     | org.apache.grails                               | grails-data-hibernate6-spring-boot                            |                        |                        | grails-data-hibernate6 |
 | org.grails                        | grails-datastore-gorm-async                     | org.apache.grails.data                          | grails-datamapping-async                                      |                        |                        | grails-data-mapping    |
 | org.grails                        | grails-datastore-gorm                           | org.apache.grails.data                          | grails-datamapping-core                                       |                        |                        | grails-data-mapping    |
 | org.grails                        | grails-datastore-gorm-test                      | org.apache.grails.data                          | grails-datamapping-core-test                                  |                        |                        | grails-data-mapping    |
 | org.grails                        | grails-datastore-gorm-hibernate5                | org.apache.grails.data                          | grails-data-hibernate5-core                                   |                        |                        | grails-data-mapping    |
-| org.grails                        | grails-datastore-gorm-hibernate6                | org.apache.grails.data                          | grails-data-hibernate6-core                                   |                        |                        | grails-data-hibernate6 |
 | org.grails                        | grails-datastore-gorm-mongodb                   | org.apache.grails.data                          | grails-data-mongodb-core                                      |                        |                        | grails-data-mapping    |
 | org.grails                        | grails-datastore-gorm-mongodb-ext               | org.apache.grails.data                          | grails-data-mongodb-ext                                       |                        |                        | grails-data-mapping    |
 | org.grails                        | grails-datastore-gorm-mongodb-bson              | org.apache.grails.data                          | grails-data-mongodb-bson                                      |                        |                        | grails-data-mapping    |

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

@@ -32,6 +32,7 @@ import org.gradle.api.artifacts.DependencyConstraint
 import org.gradle.api.artifacts.ExcludeRule
 import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.artifacts.component.ModuleComponentSelector
+import org.gradle.api.artifacts.component.ProjectComponentSelector
 import org.gradle.api.artifacts.result.DependencyResult
 import org.gradle.api.artifacts.result.ResolvedDependencyResult
 import org.gradle.api.file.ConfigurableFileCollection
@@ -188,6 +189,13 @@ abstract class ExtractDependenciesTask extends DefaultTask {
             }
 
             ResolvedDependencyResult dep = (ResolvedDependencyResult) result
+
+            // Skip project dependencies (e.g. platform(project(':grails-bom'))) since their
+            // constraints are already captured through the explicit constraints population
+            if (dep.requested instanceof ProjectComponentSelector) {
+                continue
+            }
+
             ModuleComponentSelector moduleComponentSelector = dep.requested as ModuleComponentSelector
 
             // Any non-constraint via api dependency should *always* be a platform dependency, so expand each of those

build-logic/plugins/build.gradle

@@ -38,6 +38,15 @@ dependencies {
     implementation "${gradleBomDependencies['grails-publish-plugin']}"
     implementation "org.gradle.crypto.checksum:org.gradle.crypto.checksum.gradle.plugin:${gradleProperties.gradleChecksumPluginVersion}"
     implementation "org.cyclonedx.bom:org.cyclonedx.bom.gradle.plugin:${gradleProperties.gradleCycloneDxPluginVersion}"
+    implementation "com.diffplug.spotless:spotless-plugin-gradle:${gradleProperties.spotlessVersion}"
+    implementation "com.github.spotbugs.snom:spotbugs-gradle-plugin:${gradleProperties.spotbugsPluginVersion}"
+
+    testImplementation "org.spockframework:spock-core:${gradleBomDependencyVersions['gradle-spock.version']}"
+    testImplementation gradleTestKit()
+}
+
+tasks.named('test') {
+    useJUnitPlatform()
 }
 
 gradlePlugin {
@@ -78,5 +87,9 @@ gradlePlugin {
             id = 'org.apache.grails.buildsrc.dependency-validator'
             implementationClass = 'org.apache.grails.buildsrc.GrailsDependencyValidatorPlugin'
         }
+        register('grailsTestAggregation') {
+            id = 'org.apache.grails.gradle.test-aggregation'
+            implementationClass = 'org.apache.grails.buildsrc.GrailsTestPlugin'
+        }
     }
 }

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

@@ -48,6 +48,10 @@ class GradleUtils {
             def v = findProperty(project, name)
             return v == null ? null : Integer.valueOf(v as String) as T
         }
+        if (type && (type == Boolean || type == boolean.class)) {
+            def v = findProperty(project, name)
+            return v == null ? null : Boolean.parseBoolean(v as String) as T
+        }
 
         findProperty(project, name) as T
     }

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

@@ -25,18 +25,31 @@ import groovy.transform.CompileStatic
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.Property
 
 @CompileStatic
 class GrailsCodeStyleExtension {
 
     /**
-     * Defaults to project.buildDir/checkstyle.
+     * Defaults to project.rootProject.buildDir/codestyle/checkstyle.
      * Default checkstyle files will be written here and used from this location.
      */
     final DirectoryProperty checkstyleDirectory
 
     /**
-     * Defaults to project.buildDir/codenarc.
+     * Defaults to project.rootProject.buildDir/codestyle/spotless.
+     * Directory for Spotless configuration files (e.g. greclipse.properties).
+     */
+    final DirectoryProperty spotlessDirectory
+
+    /**
+     * Defaults to project.rootProject.buildDir/codestyle/pmd.
+     * Directory for PMD configuration files (e.g. pmd.xml).
+     */
+    final DirectoryProperty pmdDirectory
+
+    /**
+     * Defaults to project.rootProject.buildDir/codestyle/codenarc.
      * Default codenarc files will be written here and used from this location.
      */
     final DirectoryProperty codenarcDirectory
@@ -50,10 +63,16 @@ class GrailsCodeStyleExtension {
     @Inject
     GrailsCodeStyleExtension(ObjectFactory objects, Project project) {
         checkstyleDirectory = objects.directoryProperty().convention(
-                project.rootProject.layout.buildDirectory.dir('checkstyle')
+                project.rootProject.layout.buildDirectory.dir('codestyle/checkstyle')
+        )
+        spotlessDirectory = objects.directoryProperty().convention(
+                project.rootProject.layout.buildDirectory.dir('codestyle/spotless')
+        )
+        pmdDirectory = objects.directoryProperty().convention(
+                project.rootProject.layout.buildDirectory.dir('codestyle/pmd')
         )
         codenarcDirectory = objects.directoryProperty().convention(
-                project.rootProject.layout.buildDirectory.dir('codenarc')
+                project.rootProject.layout.buildDirectory.dir('codestyle/codenarc')
         )
         reportsDirectory = objects.directoryProperty().convention(
                 project.rootProject.layout.buildDirectory.dir('reports/codestyle')