Hibernate 7 - Step 1

.github/workflows/gradle.yml

@@ -267,6 +267,7 @@ jobs:
           -PonlyFunctionalTests
           -PskipCodeStyle
           -PskipHibernate5Tests
+          -PskipHibernate7Tests
           -PskipMongodbTests
   mongodbFunctional:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
@@ -345,6 +346,43 @@ jobs:
           -PgrailsIndy=${{ matrix.indy }}
           -PonlyHibernate5Tests
           -PskipCodeStyle
+  hibernate7Functional:
+    if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
+    name: "Hibernate7 Functional Tests (Java ${{ matrix.java }}, indy=${{ matrix.indy }})"
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 21, 25 ]
+        indy: [ false ]
+        include:
+          - java: 21
+            indy: 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
+      - name: "📥 Checkout the repository"
+        uses: actions/checkout@v6
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
+        with:
+          distribution: liberica
+          java-version: ${{ matrix.java }}
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        with:
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+      - name: "🏃 Run Functional Tests"
+        env:
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        run: >
+          ./gradlew bootJar check
+          --continue
+          --rerun-tasks
+          --stacktrace
+          -PgrailsIndy=${{ matrix.indy }}
+          -PonlyHibernate7Tests
+          -PskipCodeStyle
   publishGradle:
     if: github.repository_owner == 'apache' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
     needs: [ buildGradle ]

DEVELOPMENT.md

@@ -35,12 +35,14 @@ These can be set on the command line like so:
 * `onlyCoreTests` - runs tests that do not include mongo, hibernate, or functional
 * `onlyFunctionalTests` - runs only grails-test-examples/* tests
 * `onlyHibernate5Tests` - runs only a hibernate5 related test
+* `onlyHibernate7Tests` - runs only a hibernate7 related test
 * `onlyMongodbTests` - runs only a mongodb related test
 * `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
 * `skipTests` - no tests will run
 

build-logic/docs-core/build.gradle

@@ -97,6 +97,7 @@ tasks.withType(Test).configureEach {
         ![
                 'onlyFunctionalTests',
                 'onlyHibernate5Tests',
+                'onlyHibernate7Tests',
                 'onlyMongodbTests',
                 'skipCoreTests',
                 'skipTests'

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

@@ -122,6 +122,26 @@ class SbomPlugin implements Plugin<Project> {
             'grails-data-hibernate5-dbmigration': [
                     'pkg:maven/javax.xml.bind/jaxb-api@2.3.1?type=jar': 'CDDL-1.1', // api export
             ],
+            // hibernate7 staging: same LGPL exemptions as hibernate5 since the staging branch uses hibernate5 artifacts
+            'grails-data-hibernate7-core'       : [
+                    'pkg:maven/org.hibernate.common/hibernate-commons-annotations@5.1.2.Final?type=jar': 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+                    'pkg:maven/org.hibernate/hibernate-core-jakarta@5.6.15.Final?type=jar'             : 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+            ],
+            'grails-data-hibernate7'            : [
+                    'pkg:maven/org.hibernate.common/hibernate-commons-annotations@5.1.2.Final?type=jar': 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+                    'pkg:maven/org.hibernate/hibernate-core-jakarta@5.6.15.Final?type=jar'             : 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+            ],
+            'grails-data-hibernate7-spring-boot': [
+                    'pkg:maven/org.hibernate.common/hibernate-commons-annotations@5.1.2.Final?type=jar': 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+                    'pkg:maven/org.hibernate/hibernate-core-jakarta@5.6.15.Final?type=jar'             : 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+            ],
+            'grails-data-hibernate7-spring-orm' : [
+                    'pkg:maven/org.hibernate.common/hibernate-commons-annotations@5.1.2.Final?type=jar': 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+                    'pkg:maven/org.hibernate/hibernate-core-jakarta@5.6.15.Final?type=jar'             : 'LGPL-2.1-only', // hibernate 5 is LGPL, we are migrating to ASF license in hibernate 7
+            ],
+            'grails-data-hibernate7-dbmigration': [
+                    'pkg:maven/javax.xml.bind/jaxb-api@2.3.1?type=jar': 'CDDL-1.1', // api export
+            ],
     ]
 
     @Override

gradle/functional-test-config.gradle

@@ -60,6 +60,7 @@ List<String> debugArguments = [
 ]
 tasks.withType(Test).configureEach { Test task ->
     boolean isHibernate5 = !project.name.startsWith('grails-test-examples-hibernate5')
+    boolean isHibernate7 = !project.name.startsWith('grails-test-examples-hibernate7')
     boolean isMongo = !project.name.startsWith('grails-test-examples-mongodb')
 
     // Honor DO_NOT_CACHE_TESTS=1 so developers can repeatedly invoke the same test command
@@ -68,27 +69,31 @@ tasks.withType(Test).configureEach { Test task ->
     task.outputs.upToDateWhen { !doNotCacheTests }
 
     onlyIf {
-        if (project.hasProperty('skipFunctionalTests')) {
+        if (['skipFunctionalTests', 'onlyCoreTests', 'skipTests'].any { project.hasProperty(it) }) {
             return false
         }
 
-        if (project.hasProperty('onlyHibernate5Tests')) {
-            if (isHibernate5) {
-                return false
-            }
+        if (!isHibernate5 && project.hasProperty('onlyHibernate5Tests')) {
+            return false
         }
 
-        if (project.hasProperty('onlyMongodbTests')) {
-            if (isMongo) {
-                return false
-            }
+        if (!isHibernate7 && project.hasProperty('onlyHibernate7Tests')) {
+            return false
+        }
+
+        if (!isMongo && project.hasProperty('onlyMongodbTests')) {
+            return false
+        }
+
+        if (isHibernate5 && project.hasProperty('skipHibernate5Tests')) {
+            return false
         }
 
-        if (project.hasProperty('onlyCoreTests')) {
+        if (isHibernate7 && project.hasProperty('skipHibernate7Tests')) {
             return false
         }
 
-        if(project.hasProperty('skipTests')) {
+        if (isMongo && project.hasProperty('skipMongodbTests')) {
             return false
         }
 

gradle/grails-data-tck-config.gradle

@@ -70,6 +70,14 @@ tasks.withType(Test).configureEach { Test it ->
             return false
         }
 
+        if (project.hasProperty('skipHibernate7Tests') && project.name.startsWith('grails-data-hibernate7')) {
+            return false
+        }
+
+        if (project.hasProperty('onlyHibernate7Tests') && !project.name.startsWith('grails-data-hibernate7')) {
+            return false
+        }
+
         if (project.hasProperty('skipHibernate5Tests') && project.name.startsWith('grails-data-hibernate5')) {
             return false
         }

gradle/hibernate5-test-config.gradle

@@ -31,6 +31,7 @@ tasks.withType(Test).configureEach {
     onlyIf {
         ![
                 'onlyFunctionalTests',
+                'onlyHibernate7Tests',
                 'skipHibernate5Tests',
                 'onlyMongodbTests',
                 'onlyCoreTests',

gradle/hibernate7-test-config.gradle

@@ -0,0 +1,75 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ */
+
+dependencies {
+    // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
+    add('testRuntimeOnly', 'org.junit.platform:junit-platform-launcher')
+}
+
+tasks.withType(Test).configureEach {
+    // Honor DO_NOT_CACHE_TESTS=1 so developers can repeatedly invoke the same test command
+    // without --rerun-tasks (and without recompiling everything else).
+    outputs.cacheIf { !doNotCacheTests }
+    outputs.upToDateWhen { !doNotCacheTests }
+
+    onlyIf {
+        ![
+                'onlyFunctionalTests',
+                'onlyHibernate5Tests',
+                'skipHibernate7Tests',
+                'onlyMongodbTests',
+                'onlyCoreTests',
+                'skipTests'
+        ].find {
+            project.hasProperty(it)
+        }
+    }
+
+    useJUnitPlatform()
+    systemProperty('hibernate7.gorm.suite', System.getProperty('hibernate7.gorm.suite') ?: true)
+    reports.html.required = !isCiBuild
+    reports.junitXml.required = !isCiBuild
+    testLogging {
+        events('passed', 'skipped', 'failed')
+        showExceptions = true
+        exceptionFormat = 'full'
+        showCauses = true
+        showStackTraces = true
+
+        // set options for log level DEBUG and INFO
+        debug {
+            events('started', 'passed', 'skipped', 'failed', 'standardOut', 'standardError')
+            exceptionFormat = 'full'
+        }
+        info.events = debug.events
+        info.exceptionFormat = debug.exceptionFormat
+    }
+    afterTest { desc, result ->
+        logger.quiet(' -- Executed test {} [{}] with result: {}', desc.name, desc.className, result.resultType)
+    }
+    afterSuite { desc, result ->
+        if (!desc.parent) { // will match the outermost suite
+            def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
+            def startItem = '|  ', endItem = '  |'
+            def repeatLength = startItem.length() + output.length() + endItem.length()
+            def dashes = '-' * repeatLength
+            logger.quiet('\n{}\n{}{}{}\n{}', dashes, startItem, output, endItem, dashes)
+        }
+    }
+}

gradle/mongodb-forked-test-config.gradle

@@ -36,6 +36,7 @@ tasks.withType(Test).configureEach {
         ![
                 'onlyFunctionalTests',
                 'onlyHibernate5Tests',
+                'onlyHibernate7Tests',
                 'skipMongodbTests',
                 'onlyCoreTests',
                 'skipTests'

gradle/mongodb-test-config.gradle

@@ -36,6 +36,7 @@ tasks.withType(Test).configureEach {
         ![
                 'onlyFunctionalTests',
                 'onlyHibernate5Tests',
+                'onlyHibernate7Tests',
                 'skipMongodbTests',
                 'onlyCoreTests',
                 'skipTests'

gradle/publish-root-config.gradle

@@ -33,6 +33,7 @@ def publishedProjects = [
         'grails-base-bom',
         'grails-bom',
         'grails-hibernate5-bom',
+        'grails-hibernate7-bom',
         'grails-micronaut-bom',
         'grails-bootstrap',
         'grails-cache',
@@ -121,6 +122,12 @@ def publishedProjects = [
         'grails-data-hibernate5-dbmigration',
         'grails-data-hibernate5-spring-boot',
         'grails-data-hibernate5-spring-orm',
+        // hibernate7
+        'grails-data-hibernate7',
+        'grails-data-hibernate7-core',
+        'grails-data-hibernate7-dbmigration',
+        'grails-data-hibernate7-spring-boot',
+        'grails-data-hibernate7-spring-orm',
         // mongodb
         'grails-data-mongodb',
         'grails-data-mongodb-bson',

gradle/test-config.gradle

@@ -53,6 +53,7 @@ tasks.withType(Test).configureEach {
         ![
                 'onlyFunctionalTests',
                 'onlyHibernate5Tests',
+                'onlyHibernate7Tests',
                 'onlyMongodbTests',
                 'skipCoreTests',
                 'skipTests'