You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/04/10 18:01:16 UTC

(grails-core) branch 8.0.x-hibernate7 updated (1507355f35 -> ec1219804f)

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a change to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git


    from 1507355f35 Restore commenting
     new ac0f947d81 Fix versions coming from the boms and do not hard code versions across any hibernate 5 or hibernate 7 project
     new 8bc5d30e96 fix broken dbmigration tests
     new 914e07a232 H7 increase test coverge
     new ec1219804f Update check-qual to match micronaut version

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../tasks/bom/ExtractDependenciesTask.groovy       |   3 +
 dependencies.gradle                                | 243 +++++++-----
 gradle.properties                                  |   7 -
 gradle/publish-root-config.gradle                  |   1 +
 gradle/rat-root-config.gradle                      |  10 -
 grails-bom/README.md                               |  19 -
 grails-bom/{ => base}/build.gradle                 |  24 +-
 grails-bom/{ => default}/build.gradle              |  68 +---
 .../hibernate5}/build.gradle                       |  60 ++-
 .../hibernate7}/build.gradle                       |  76 ++--
 grails-data-hibernate5/core/build.gradle           |   6 +-
 grails-data-hibernate5/dbmigration/build.gradle    |  21 +-
 grails-data-hibernate5/docs/build.gradle           |   3 +-
 .../asciidoc/databaseMigration/gettingStarted.adoc |   5 +-
 grails-data-hibernate5/grails-plugin/build.gradle  |   4 +-
 grails-data-hibernate5/spring-orm/build.gradle     |   2 +-
 grails-data-hibernate7/boot-plugin/build.gradle    |   2 +-
 grails-data-hibernate7/core/build.gradle           |  47 ++-
 .../orm/HibernateCriteriaBuilderDirectSpec.groovy  | 420 +++++++++++++++++++++
 .../orm/hibernate/HibernateDatastoreSpec.groovy    | 103 +++++
 .../hibernate/SchemaTenantGormEnhancerSpec.groovy  |  24 +-
 grails-data-hibernate7/dbmigration/build.gradle    |  46 +--
 .../integration-test/resources/logback-test.xml    |  36 ++
 .../DbmGenerateGormChangelogCommandSpec.groovy     |   8 +-
 .../command/DbmGormDiffCommandSpec.groovy          |   8 +-
 grails-data-hibernate7/docs/build.gradle           |   5 +-
 grails-data-hibernate7/grails-plugin/build.gradle  |  22 +-
 grails-data-hibernate7/spring-orm/build.gradle     |   4 +-
 grails-data-mongodb/core/build.gradle              |   4 +-
 grails-data-mongodb/docs/build.gradle              |   7 +-
 .../grails-forge-analytics-postgres/build.gradle   |   2 +-
 grails-forge/grails-forge-cli/build.gradle         |   2 +-
 .../forge/feature/database/MongoSyncSpec.groovy    |   2 +-
 .../feature/database/TestContainersSpec.groovy     |   6 +-
 grails-test-examples/database-cleanup/build.gradle |   2 +-
 grails-test-examples/gorm/build.gradle             |   2 +-
 .../grails-hibernate-groovy-proxy/build.gradle     |   2 +-
 .../hibernate5/grails-hibernate/build.gradle       |   2 +-
 .../build.gradle                                   |   2 +-
 .../hibernate7/grails-data-service/build.gradle    |   2 +-
 .../grails-database-per-tenant/build.gradle        |   4 +-
 .../grails-hibernate-groovy-proxy/build.gradle     |   4 +-
 .../hibernate7/grails-hibernate/build.gradle       |   9 +-
 .../grails-multiple-datasources/build.gradle       |   2 +-
 .../build.gradle                                   |   2 +-
 .../grails-partitioned-multi-tenancy/build.gradle  |   4 +-
 .../grails-schema-per-tenant/build.gradle          |   4 +-
 .../hibernate7/issue450/build.gradle               |   4 +-
 .../hibernate7/spring-boot-hibernate/build.gradle  |   2 +-
 .../hibernate7/standalone-hibernate/build.gradle   |   2 +-
 grails-test-examples/hyphenated/build.gradle       |   2 +-
 .../mongodb/hibernate5/build.gradle                |   2 +-
 grails-testing-support-dbcleanup-core/README.md    |   4 +-
 .../README.md                                      |   4 +-
 .../build.gradle                                   |   4 +-
 settings.gradle                                    |   6 +
 56 files changed, 974 insertions(+), 397 deletions(-)
 delete mode 100644 grails-bom/README.md
 copy grails-bom/{ => base}/build.gradle (93%)
 rename grails-bom/{ => default}/build.gradle (77%)
 rename {grails-hibernate5-bom => grails-bom/hibernate5}/build.gradle (70%)
 rename {grails-hibernate7-bom => grails-bom/hibernate7}/build.gradle (70%)


(grails-core) 03/04: H7 increase test coverge

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit 914e07a2328846814fcf3982158e161ad391284e
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Fri Apr 10 11:40:57 2026 -0500

    H7 increase test coverge
---
 .../orm/HibernateCriteriaBuilderDirectSpec.groovy  | 420 +++++++++++++++++++++
 .../orm/hibernate/HibernateDatastoreSpec.groovy    | 103 +++++
 .../hibernate/SchemaTenantGormEnhancerSpec.groovy  |  24 +-
 3 files changed, 538 insertions(+), 9 deletions(-)

diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy
index 150708291c..9f93d71ba7 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/orm/HibernateCriteriaBuilderDirectSpec.groovy
@@ -290,6 +290,426 @@ class HibernateCriteriaBuilderDirectSpec extends HibernateGormDatastoreSpec {
         results[0].firstName == "Fred"
     }
 
+    void "test properties and projections methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+
+        then:
+        b.property("firstName")
+        b.distinct("lastName")
+        b.avg("balance")
+        b.projections() != null
+        b.closeSession()
+    }
+
+    void "test boolean flags and setter getter methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.uniqueResult = true
+        b.distinct = true
+        b.count = true
+        b.paginationEnabledList = true
+        b.scroll = true
+        
+        then:
+        b.isUniqueResult() == true
+        b.isDistinct() == true
+        b.isCount() == true
+        b.isPaginationEnabledList() == true
+        b.isScroll() == true
+        b.getInstance() == null
+        b.getCriteriaBuilder() != null
+        b.getSessionFactory() != null
+        b.getHibernateQuery() != null
+        b.isParticipate() == true
+        b.getDefaultFlushMode() == org.grails.orm.hibernate.GrailsHibernateTemplate.FLUSH_AUTO
+        
+        when:
+        b.setDefaultFlushMode(1)
+        then:
+        b.getDefaultFlushMode() == 1
+        
+        when:
+        b.lock(true)
+        b.cache(true)
+        b.maxResults(10)
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test alias and join methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.join("transactions")
+        b.join("transactions", jakarta.persistence.criteria.JoinType.INNER)
+        b.select("transactions")
+        b.createAlias("transactions", "t")
+        b.createAlias("transactions", "t2", 1) // LEFT
+        b.createAlias("transactions", "t3", 2) // RIGHT
+        b.createAlias("transactions", "t4", 3) // INNER
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test exception handling"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.throwRuntimeException(new RuntimeException("test exception"))
+        
+        then:
+        thrown(RuntimeException)
+    }
+
+    void "test missing criterion methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.eqProperty("firstName", "lastName")
+        b.neProperty("firstName", "lastName")
+        b.gtProperty("firstName", "lastName")
+        b.geProperty("firstName", "lastName")
+        b.ltProperty("firstName", "lastName")
+        b.leProperty("firstName", "lastName")
+        
+        b.allEq(["firstName": "Fred"])
+        b.idEq(1L)
+        b.idEquals(1L)
+        
+        b.isEmpty("firstName")
+        b.isNotEmpty("firstName")
+        b.isNull("firstName")
+        b.isNotNull("firstName")
+        
+        b.like("firstName", "Fre%")
+        b.ilike("firstName", "fre%")
+        b.rlike("firstName", ".*")
+        
+        b.in("firstName", ["Fred", "Barney"])
+        b.inList("firstName", ["Fred", "Barney"])
+        b.inList("firstName", "Fred", "Barney")
+        b.in("firstName", "Fred", "Barney")
+        b.notIn("firstName") { eq("firstName", "Wilma") }
+        
+        b.gt("balance", 100)
+        b.ge("balance", 100)
+        b.gte("balance", 100)
+        b.lt("balance", 100)
+        b.le("balance", 100)
+        b.lte("balance", 100)
+        b.ne("balance", 100)
+        b.between("balance", 100, 200)
+
+        b.sizeEq("transactions", 1)
+        b.sizeGt("transactions", 1)
+        b.sizeGe("transactions", 1)
+        b.sizeLt("transactions", 1)
+        b.sizeLe("transactions", 1)
+        b.sizeNe("transactions", 1)
+
+        b.order("firstName")
+        b.order("lastName", "desc")
+        b.firstResult(0)
+        
+        b.and { eq("firstName", "Fred") }
+        b.or { eq("firstName", "Fred") }
+        b.not { eq("firstName", "Fred") }
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test subqueries with closures"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        
+        b.eqAll("balance") { eq("balance", 100) }
+        b.gtAll("balance") { eq("balance", 100) }
+        b.geAll("balance") { eq("balance", 100) }
+        b.ltAll("balance") { eq("balance", 100) }
+        b.leAll("balance") { eq("balance", 100) }
+        
+        b.gtSome("balance") { eq("balance", 100) }
+        b.geSome("balance") { eq("balance", 100) }
+        b.ltSome("balance") { eq("balance", 100) }
+        b.leSome("balance") { eq("balance", 100) }
+        
+        b.in("balance") { eq("balance", 100) }
+        b.inList("balance") { eq("balance", 100) }
+        b.notIn("balance") { eq("balance", 100) }
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test subqueries with QueryableCriteria"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        def criteria = new grails.gorm.DetachedCriteria(DirectAccount).build { eq("balance", 100) }
+        
+        b.eqAll("balance", criteria)
+        b.gtAll("balance", criteria)
+        b.geAll("balance", criteria)
+        b.ltAll("balance", criteria)
+        b.leAll("balance", criteria)
+        
+        b.gtSome("balance", criteria)
+        b.geSome("balance", criteria)
+        b.ltSome("balance", criteria)
+        b.leSome("balance", criteria)
+        
+        b.in("balance", criteria)
+        b.inList("balance", criteria)
+        b.notIn("balance", criteria)
+
+        b.exists(criteria)
+        b.notExists(criteria)
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test execution methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.list { eq("firstName", "Fred") }
+        b.list([max: 10]) { eq("firstName", "Fred") }
+        b.listDistinct { eq("firstName", "Fred") }
+        b.get { eq("firstName", "Fred") }
+        try { b.scroll { eq("firstName", "Fred") } } catch(UnsupportedOperationException e) { /* expected in this mock environment */ }
+        b.list()
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test properties and projections methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+
+        then:
+        b.property("firstName")
+        b.distinct("lastName")
+        b.avg("balance")
+        b.projections() != null
+        b.closeSession()
+    }
+
+    void "test boolean flags and setter getter methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.uniqueResult = true
+        b.distinct = true
+        b.count = true
+        b.paginationEnabledList = true
+        b.scroll = true
+        
+        then:
+        b.isUniqueResult() == true
+        b.isDistinct() == true
+        b.isCount() == true
+        b.isPaginationEnabledList() == true
+        b.isScroll() == true
+        b.getInstance() == null
+        b.getCriteriaBuilder() != null
+        b.getSessionFactory() != null
+        b.getHibernateQuery() != null
+        b.isParticipate() == true
+        b.getDefaultFlushMode() == org.grails.orm.hibernate.GrailsHibernateTemplate.FLUSH_AUTO
+        
+        when:
+        b.setDefaultFlushMode(1)
+        then:
+        b.getDefaultFlushMode() == 1
+        
+        when:
+        b.lock(true)
+        b.cache(true)
+        b.maxResults(10)
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test alias and join methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.join("transactions")
+        b.join("transactions", jakarta.persistence.criteria.JoinType.INNER)
+        b.select("transactions")
+        b.createAlias("transactions", "t")
+        b.createAlias("transactions", "t2", 1) // LEFT
+        b.createAlias("transactions", "t3", 2) // RIGHT
+        b.createAlias("transactions", "t4", 3) // INNER
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test exception handling"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.throwRuntimeException(new RuntimeException("test exception"))
+        
+        then:
+        thrown(RuntimeException)
+    }
+
+    void "test missing criterion methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.eqProperty("firstName", "lastName")
+        b.neProperty("firstName", "lastName")
+        b.gtProperty("firstName", "lastName")
+        b.geProperty("firstName", "lastName")
+        b.ltProperty("firstName", "lastName")
+        b.leProperty("firstName", "lastName")
+        
+        b.allEq(["firstName": "Fred"])
+        b.idEq(1L)
+        b.idEquals(1L)
+        
+        b.isEmpty("firstName")
+        b.isNotEmpty("firstName")
+        b.isNull("firstName")
+        b.isNotNull("firstName")
+        
+        b.like("firstName", "Fre%")
+        b.ilike("firstName", "fre%")
+        b.rlike("firstName", ".*")
+        
+        b.in("firstName", ["Fred", "Barney"])
+        b.inList("firstName", ["Fred", "Barney"])
+        b.inList("firstName", "Fred", "Barney")
+        b.in("firstName", "Fred", "Barney")
+        b.notIn("firstName") { eq("firstName", "Wilma") }
+        
+        b.gt("balance", 100)
+        b.ge("balance", 100)
+        b.gte("balance", 100)
+        b.lt("balance", 100)
+        b.le("balance", 100)
+        b.lte("balance", 100)
+        b.ne("balance", 100)
+        b.between("balance", 100, 200)
+
+        b.sizeEq("transactions", 1)
+        b.sizeGt("transactions", 1)
+        b.sizeGe("transactions", 1)
+        b.sizeLt("transactions", 1)
+        b.sizeLe("transactions", 1)
+        b.sizeNe("transactions", 1)
+
+        b.order("firstName")
+        b.order("lastName", "desc")
+        b.firstResult(0)
+        
+        b.and { eq("firstName", "Fred") }
+        b.or { eq("firstName", "Fred") }
+        b.not { eq("firstName", "Fred") }
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test subqueries with closures"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        
+        b.eqAll("balance") { eq("balance", 100) }
+        b.gtAll("balance") { eq("balance", 100) }
+        b.geAll("balance") { eq("balance", 100) }
+        b.ltAll("balance") { eq("balance", 100) }
+        b.leAll("balance") { eq("balance", 100) }
+        
+        b.gtSome("balance") { eq("balance", 100) }
+        b.geSome("balance") { eq("balance", 100) }
+        b.ltSome("balance") { eq("balance", 100) }
+        b.leSome("balance") { eq("balance", 100) }
+        
+        b.in("balance") { eq("balance", 100) }
+        b.inList("balance") { eq("balance", 100) }
+        b.notIn("balance") { eq("balance", 100) }
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test subqueries with QueryableCriteria"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        def criteria = new grails.gorm.DetachedCriteria(DirectAccount).build { eq("balance", 100) }
+        
+        b.eqAll("balance", criteria)
+        b.gtAll("balance", criteria)
+        b.geAll("balance", criteria)
+        b.ltAll("balance", criteria)
+        b.leAll("balance", criteria)
+        
+        b.gtSome("balance", criteria)
+        b.geSome("balance", criteria)
+        b.ltSome("balance", criteria)
+        b.leSome("balance", criteria)
+        
+        b.in("balance", criteria)
+        b.inList("balance", criteria)
+        b.notIn("balance", criteria)
+
+        b.exists(criteria)
+        b.notExists(criteria)
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
+    void "test execution methods"() {
+        when:
+        def b = new HibernateCriteriaBuilder(DirectAccount, manager.hibernateDatastore.sessionFactory, manager.hibernateDatastore)
+        b.list { eq("firstName", "Fred") }
+        b.list([max: 10]) { eq("firstName", "Fred") }
+        b.listDistinct { eq("firstName", "Fred") }
+        b.get { eq("firstName", "Fred") }
+        try { b.scroll { eq("firstName", "Fred") } } catch(UnsupportedOperationException e) { /* expected in this mock environment */ }
+        b.list()
+        
+        then:
+        noExceptionThrown()
+        
+        cleanup:
+        b.closeSession()
+    }
+
     // ─── Comparison predicates ─────────────────────────────────────────────
 
     def "eq(String, Object) delegates and returns this"() {
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
index f792084283..9a2a9302bd 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreSpec.groovy
@@ -248,6 +248,109 @@ class HibernateDatastoreSpec extends HibernateGormDatastoreSpec {
         expect:
         datastore.getMetadata() != null
     }
+
+    void "test toString returns datasource name"() {
+        expect:
+        datastore.toString() == "HibernateDatastore: default"
+    }
+
+    void "test withSession and withNewSession for connectionName"() {
+        when:
+        def result1 = datastore.withSession("default") { session -> return "session1" }
+        def result2 = datastore.withNewSession("default") { session -> return "session2" }
+
+        then:
+        result1 == "session1"
+        result2 == "session2"
+    }
+
+    void "test withNewSession with tenantId for non-DATABASE multitenancy"() {
+        when:
+        def result = datastore.withNewSession((Serializable) "someTenant") { session -> return "sessionTenant" }
+
+        then:
+        result == "sessionTenant"
+    }
+
+    void "test close handles exception"() {
+        given:
+        def ds = new HibernateDatastore(Collections.singletonMap(Settings.SETTING_DB_CREATE, "create-drop"), GHUBook) {
+            @Override
+            void destroy() throws Exception {
+                throw new RuntimeException("destroy failed")
+            }
+        }
+        
+        when:
+        ds.close()
+
+        then:
+        noExceptionThrown()
+    }
+    
+    void "test constructors"() {
+        given:
+        def configMap = new HashMap<>(manager.grailsConfig)
+        configMap.put("dataSource.url", "jdbc:h2:mem:grailsDB-constructors;LOCK_TIMEOUT=10000") // avoid clash with datastore
+        org.springframework.core.env.PropertyResolver propertyResolver = org.grails.datastore.mapping.core.DatastoreUtils.createPropertyResolver(configMap)
+        def dataSource = datastore.dataSource
+        def eventPublisher = datastore.applicationEventPublisher as org.grails.datastore.gorm.events.ConfigurableApplicationEventPublisher
+        Package pkg = String.getPackage()
+        
+        when: "Constructor with EventPublisher and Classes"
+        def ds1 = new HibernateDatastore(propertyResolver, eventPublisher, GHUBook)
+        then:
+        ds1 != null
+        ds1.close()
+
+        when: "Constructor with DataSource, EventPublisher and Classes"
+        def ds2 = new HibernateDatastore(dataSource, propertyResolver, eventPublisher, GHUBook)
+        then:
+        ds2 != null
+        ds2.close()
+
+        when: "Constructor with EventPublisher and Packages"
+        def ds3 = new HibernateDatastore(propertyResolver, eventPublisher, pkg)
+        then:
+        ds3 != null
+        ds3.close()
+
+        when: "Constructor with DataSource, EventPublisher and Packages"
+        def ds4 = new HibernateDatastore(dataSource, propertyResolver, eventPublisher, pkg)
+        then:
+        ds4 != null
+        ds4.close()
+
+        when: "Constructor with Configuration Map and Packages"
+        def ds5 = new HibernateDatastore(configMap, pkg)
+        then:
+        ds5 != null
+        ds5.close()
+        
+        when: "Constructor with Packages only"
+        def ds6 = new HibernateDatastore(pkg)
+        then:
+        ds6 != null
+        ds6.close()
+        
+        when: "Constructor with MappingContext, SessionFactory, PropertyResolver, ApplicationContext, dataSourceName"
+        def ds7 = new HibernateDatastore(datastore.mappingContext, datastore.sessionFactory, propertyResolver, datastore.applicationContext, "default")
+        then:
+        ds7 != null
+        
+        when: "Constructor with MappingContext, SessionFactory, PropertyResolver"
+        def ds8 = new HibernateDatastore(datastore.mappingContext, datastore.sessionFactory, propertyResolver)
+        then:
+        ds8 != null
+    }
+
+    void "test setMessageSource"() {
+        when:
+        datastore.setMessageSource(Mock(org.springframework.context.MessageSource))
+
+        then:
+        noExceptionThrown()
+    }
 }
 
 @Entity
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantGormEnhancerSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantGormEnhancerSpec.groovy
index c7b7565d94..487ed0ffc6 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantGormEnhancerSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantGormEnhancerSpec.groovy
@@ -32,7 +32,7 @@ import spock.lang.Shared
 import spock.lang.Specification
 
 /**
- * Verifies the behaviour of {@link HibernateDatastore.SchemaTenantGormEnhancer}
+ * Verifies the behaviour of SchemaTenantGormEnhancer
  * which is instantiated when the datastore runs in SCHEMA multi-tenancy mode.
  *
  * Because Hibernate infrastructure classes are final / sealed, we drive the
@@ -45,7 +45,7 @@ class SchemaTenantGormEnhancerSpec extends Specification {
     HibernateDatastore datastore
 
     @Shared
-    HibernateDatastore.SchemaTenantGormEnhancer enhancer
+    def enhancer
 
     void setupSpec() {
         System.setProperty(SystemPropertyTenantResolver.PROPERTY_NAME, "")
@@ -60,7 +60,7 @@ class SchemaTenantGormEnhancerSpec extends Specification {
                 'hibernate.hbm2ddl.auto'                  : 'create',
         ]
         datastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(config), SchemaTenantBook)
-        enhancer = datastore.gormEnhancer as HibernateDatastore.SchemaTenantGormEnhancer
+        enhancer = datastore.gormEnhancer
     }
 
     void cleanupSpec() {
@@ -70,7 +70,7 @@ class SchemaTenantGormEnhancerSpec extends Specification {
 
     void "gormEnhancer is an instance of SchemaTenantGormEnhancer in SCHEMA mode"() {
         expect:
-        enhancer instanceof HibernateDatastore.SchemaTenantGormEnhancer
+        enhancer.getClass().name == "org.grails.orm.hibernate.HibernateDatastore\$SchemaTenantGormEnhancer"
     }
 
     void "allQualifiers includes tenant IDs from AllTenantsResolver for MultiTenant entity"() {
@@ -112,15 +112,21 @@ class SchemaTenantGormEnhancerSpec extends Specification {
     }
 
     void "SchemaTenantGormEnhancer is a public static nested class of HibernateDatastore"() {
+        given:
+        def enhancerClass = Class.forName("org.grails.orm.hibernate.HibernateDatastore\$SchemaTenantGormEnhancer")
+        
         expect:
-        HibernateDatastore.SchemaTenantGormEnhancer.enclosingClass == HibernateDatastore
-        Modifier.isStatic(HibernateDatastore.SchemaTenantGormEnhancer.modifiers)
-        Modifier.isPublic(HibernateDatastore.SchemaTenantGormEnhancer.modifiers)
+        enhancerClass.enclosingClass == HibernateDatastore
+        Modifier.isStatic(enhancerClass.modifiers)
+        Modifier.isPublic(enhancerClass.modifiers)
     }
 
     void "SchemaTenantGormEnhancer extends HibernateGormEnhancer"() {
+        given:
+        def enhancerClass = Class.forName("org.grails.orm.hibernate.HibernateDatastore\$SchemaTenantGormEnhancer")
+
         expect:
-        HibernateGormEnhancer.isAssignableFrom(HibernateDatastore.SchemaTenantGormEnhancer)
+        HibernateGormEnhancer.isAssignableFrom(enhancerClass)
     }
 
     // -------------------------------------------------------------------------
@@ -142,7 +148,7 @@ class SchemaTenantGormEnhancerSpec extends Specification {
         ]
         HibernateDatastore schemaDs = new HibernateDatastore(
             DatastoreUtils.createPropertyResolver(config), SchemaTenantBook)
-        def schemaEnhancer = schemaDs.gormEnhancer as HibernateDatastore.SchemaTenantGormEnhancer
+        def schemaEnhancer = schemaDs.gormEnhancer
         def entity = schemaDs.getMappingContext().getPersistentEntity(SchemaTenantBook.name)
 
         when: "allQualifiers resolves via schemaHandler (H2 returns no custom schemas)"


(grails-core) 01/04: Fix versions coming from the boms and do not hard code versions across any hibernate 5 or hibernate 7 project

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit ac0f947d8109ddc798e0f1c0aad7a1d66f1ae84f
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri Apr 10 13:48:59 2026 -0400

    Fix versions coming from the boms and do not hard code versions across any hibernate 5 or hibernate 7 project
---
 .../tasks/bom/ExtractDependenciesTask.groovy       |   3 +
 dependencies.gradle                                | 243 +++++++++++++--------
 gradle.properties                                  |   7 -
 gradle/publish-root-config.gradle                  |   1 +
 gradle/rat-root-config.gradle                      |  10 -
 grails-bom/README.md                               |  19 --
 grails-bom/{ => base}/build.gradle                 |  24 +-
 grails-bom/{ => default}/build.gradle              |  68 +-----
 .../hibernate5}/build.gradle                       |  60 ++++-
 .../hibernate7}/build.gradle                       |  76 +++++--
 grails-data-hibernate5/core/build.gradle           |   6 +-
 grails-data-hibernate5/dbmigration/build.gradle    |  21 +-
 grails-data-hibernate5/docs/build.gradle           |   3 +-
 .../asciidoc/databaseMigration/gettingStarted.adoc |   5 +-
 grails-data-hibernate5/grails-plugin/build.gradle  |   4 +-
 grails-data-hibernate5/spring-orm/build.gradle     |   2 +-
 grails-data-hibernate7/boot-plugin/build.gradle    |   2 +-
 grails-data-hibernate7/core/build.gradle           |  47 ++--
 grails-data-hibernate7/dbmigration/build.gradle    |  46 ++--
 grails-data-hibernate7/docs/build.gradle           |   5 +-
 grails-data-hibernate7/grails-plugin/build.gradle  |  22 +-
 grails-data-hibernate7/spring-orm/build.gradle     |   4 +-
 grails-data-mongodb/core/build.gradle              |   4 +-
 grails-data-mongodb/docs/build.gradle              |   7 +-
 .../grails-forge-analytics-postgres/build.gradle   |   2 +-
 grails-forge/grails-forge-cli/build.gradle         |   2 +-
 .../forge/feature/database/MongoSyncSpec.groovy    |   2 +-
 .../feature/database/TestContainersSpec.groovy     |   6 +-
 grails-test-examples/database-cleanup/build.gradle |   2 +-
 grails-test-examples/gorm/build.gradle             |   2 +-
 .../grails-hibernate-groovy-proxy/build.gradle     |   2 +-
 .../hibernate5/grails-hibernate/build.gradle       |   2 +-
 .../build.gradle                                   |   2 +-
 .../hibernate7/grails-data-service/build.gradle    |   2 +-
 .../grails-database-per-tenant/build.gradle        |   4 +-
 .../grails-hibernate-groovy-proxy/build.gradle     |   4 +-
 .../hibernate7/grails-hibernate/build.gradle       |   9 +-
 .../grails-multiple-datasources/build.gradle       |   2 +-
 .../build.gradle                                   |   2 +-
 .../grails-partitioned-multi-tenancy/build.gradle  |   4 +-
 .../grails-schema-per-tenant/build.gradle          |   4 +-
 .../hibernate7/issue450/build.gradle               |   4 +-
 .../hibernate7/spring-boot-hibernate/build.gradle  |   2 +-
 .../hibernate7/standalone-hibernate/build.gradle   |   2 +-
 grails-test-examples/hyphenated/build.gradle       |   2 +-
 .../mongodb/hibernate5/build.gradle                |   2 +-
 grails-testing-support-dbcleanup-core/README.md    |   4 +-
 .../README.md                                      |   4 +-
 .../build.gradle                                   |   4 +-
 settings.gradle                                    |   6 +
 50 files changed, 392 insertions(+), 380 deletions(-)

diff --git a/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy b/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
index 1ce6dcade6..4a45cf4003 100644
--- a/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
+++ b/build-logic/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy
@@ -207,6 +207,9 @@ abstract class ExtractDependenciesTask extends DefaultTask {
 
             // fetch the BOM as a pom file so it can be expanded
             ExtractedDependencyConstraint constraint = propertyNameCalculator.calculate(bomCoordinate.groupId, bomCoordinate.artifactId, bomCoordinate.version, true)
+            if(!constraint) {
+                throw new GradleException("Failed to find a property name for BOM dependency: ${bomCoordinate.coordinates}. All platform dependencies must have a property name defined meeting the naming requirements.")
+            }
             constraint.source = bomCoordinate.artifactId
             constraints.put(bomCoordinate.toCoordinateHolder(), constraint)
 
diff --git a/dependencies.gradle b/dependencies.gradle
index 00fb089554..a317053ef1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -38,14 +38,12 @@ ext {
             'jquery.version'                : '3.7.1',
             'objenesis.version'             : '3.4',
             'spring-boot.version'           : '4.0.5',
-            'testcontainers.version'        : '1.20.1',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
     gradleBomPlatformDependencies = [
             'spring-boot-bom' : "org.springframework.boot:spring-boot-dependencies:${gradleBomDependencyVersions['spring-boot.version']}",
             'gradle-spock-bom': "org.spockframework:spock-bom:${gradleBomDependencyVersions['gradle-spock.version']}",
-            'testcontainers-bom': "org.testcontainers:testcontainers-bom:${gradleBomDependencyVersions['testcontainers.version']}",
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -70,29 +68,31 @@ ext {
     ]
 
     bomDependencyVersions = [
-            'asset-pipeline-bom.version'  : '5.1.0-M4',
-            'bootstrap-icons.version'     : '1.13.1',
-            'bootstrap.version'           : '5.3.8',
-            'commons-codec.version'       : '1.19.0',
-            'commons-lang3.version'       : '3.20.0',
-            'geb-spock.version'           : '8.0.1',
-            'groovy.version'              : '4.0.31',
-            'jquery.version'              : '3.7.1',
-            'liquibase-hibernate5.version': '4.27.0',
-            'mongodb.version'             : '5.6.4',
-            'rxjava.version'              : '1.3.8',
-            'rxjava2.version'             : '2.2.21',
-            'rxjava3.version'             : '3.1.12',
-            'selenium.version'            : '4.38.0',
-            'kotlin.version'              : '2.2.21',
-            'mockito.version'             : '5.20.0',
-            'spock.version'               : '2.3-groovy-4.0',
-            'sitemesh.version'            : '2.6.0',
-            'starter-sitemesh.version'    : '3.2.2',
+            'asset-pipeline-bom.version'    : '5.1.0-M4',
+            'bootstrap-icons.version'       : '1.13.1',
+            'bootstrap.version'             : '5.3.8',
+            'checker-qual.version'          : '3.48.4',
+            'commons-codec.version'         : '1.19.0',
+            'commons-lang3.version'         : '3.20.0',
+            'geb-spock.version'             : '8.0.1',
+            'groovy.version'                : '4.0.31',
+            'jquery.version'                : '3.7.1',
+            'liquibase-hibernate5.version'  : '4.27.0',
+            'mongodb.version'               : '5.6.4',
+            'rxjava.version'                : '1.3.8',
+            'rxjava2.version'               : '2.2.21',
+            'rxjava3.version'               : '3.1.12',
+            'selenium.version'              : '4.38.0',
+            'kotlin.version'                : '2.2.21',
+            'mockito.version'               : '5.20.0',
+            'spock.version'                 : '2.3-groovy-4.0',
+            'sitemesh.version'              : '2.6.0',
+            'starter-sitemesh.version'      : '3.2.2',
             // Spring Boot 4 no longer manages spring-retry; pin it here so the
             // grails-shell-cli SpringRetryCompilerAutoConfiguration's unversioned
             // reference resolves and consumer apps using @Retryable get a known version.
-            'spring-retry.version'        : '2.0.11',
+            'spring-retry.version'          : '2.0.11',
+            'hibernate-groovy-proxy.version': '1.1',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -105,65 +105,67 @@ ext {
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
     bomDependencies = [
-            'bootstrap'                : "org.webjars.npm:bootstrap:${bomDependencyVersions['bootstrap.version']}",
-            'bootstrap-icons'          : "org.webjars.npm:bootstrap-icons:${bomDependencyVersions['bootstrap-icons.version']}",
-            'commons-codec'            : "commons-codec:commons-codec:${bomDependencyVersions['commons-codec.version']}",
-            'commons-lang3'            : "org.apache.commons:commons-lang3:${bomDependencyVersions['commons-lang3.version']}",
-            'byte-buddy-agent'         : "net.bytebuddy:byte-buddy-agent:${gradleBomDependencyVersions['byte-buddy.version']}",
-            'geb-spock'                : "org.apache.groovy.geb:geb-spock:${bomDependencyVersions['geb-spock.version']}",
+            'bootstrap'             : "org.webjars.npm:bootstrap:${bomDependencyVersions['bootstrap.version']}",
+            'bootstrap-icons'       : "org.webjars.npm:bootstrap-icons:${bomDependencyVersions['bootstrap-icons.version']}",
+            'checker-qual'          : "org.checkerframework:checker-qual:${bomDependencyVersions['checker-qual.version']}",
+            'commons-codec'         : "commons-codec:commons-codec:${bomDependencyVersions['commons-codec.version']}",
+            'commons-lang3'         : "org.apache.commons:commons-lang3:${bomDependencyVersions['commons-lang3.version']}",
+            'byte-buddy-agent'      : "net.bytebuddy:byte-buddy-agent:${gradleBomDependencyVersions['byte-buddy.version']}",
+            'geb-spock'             : "org.apache.groovy.geb:geb-spock:${bomDependencyVersions['geb-spock.version']}",
             // start - restate the groovy-bom includes here because the spring dependency management will pick the library from spring-boot-dependencies otherwise
-            'groovy'                   : "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}",
-            'groovy-ant'               : "org.apache.groovy:groovy-ant:${bomDependencyVersions['groovy.version']}",
-            'groovy-astbuilder'        : "org.apache.groovy:groovy-astbuilder:${bomDependencyVersions['groovy.version']}",
-            'groovy-cli-commons'       : "org.apache.groovy:groovy-cli-commons:${bomDependencyVersions['groovy.version']}",
-            'groovy-cli-picocli'       : "org.apache.groovy:groovy-cli-picocli:${bomDependencyVersions['groovy.version']}",
-            'groovy-console'           : "org.apache.groovy:groovy-console:${bomDependencyVersions['groovy.version']}",
-            'groovy-contracts'         : "org.apache.groovy:groovy-contracts:${bomDependencyVersions['groovy.version']}",
-            'groovy-datetime'          : "org.apache.groovy:groovy-datetime:${bomDependencyVersions['groovy.version']}",
-            'groovy-dateutil'          : "org.apache.groovy:groovy-dateutil:${bomDependencyVersions['groovy.version']}",
-            'groovy-docgenerator'      : "org.apache.groovy:groovy-docgenerator:${bomDependencyVersions['groovy.version']}",
-            'groovy-ginq'              : "org.apache.groovy:groovy-ginq:${bomDependencyVersions['groovy.version']}",
-            'groovy-groovydoc'         : "org.apache.groovy:groovy-groovydoc:${bomDependencyVersions['groovy.version']}",
-            'groovy-groovysh'          : "org.apache.groovy:groovy-groovysh:${bomDependencyVersions['groovy.version']}",
-            'groovy-jmx'               : "org.apache.groovy:groovy-jmx:${bomDependencyVersions['groovy.version']}",
-            'groovy-json'              : "org.apache.groovy:groovy-json:${bomDependencyVersions['groovy.version']}",
-            'groovy-jsr223'            : "org.apache.groovy:groovy-jsr223:${bomDependencyVersions['groovy.version']}",
-            'groovy-macro'             : "org.apache.groovy:groovy-macro:${bomDependencyVersions['groovy.version']}",
-            'groovy-macro-library'     : "org.apache.groovy:groovy-macro-library:${bomDependencyVersions['groovy.version']}",
-            'groovy-nio'               : "org.apache.groovy:groovy-nio:${bomDependencyVersions['groovy.version']}",
-            'groovy-servlet'           : "org.apache.groovy:groovy-servlet:${bomDependencyVersions['groovy.version']}",
-            'groovy-sql'               : "org.apache.groovy:groovy-sql:${bomDependencyVersions['groovy.version']}",
-            'groovy-swing'             : "org.apache.groovy:groovy-swing:${bomDependencyVersions['groovy.version']}",
-            'groovy-templates'         : "org.apache.groovy:groovy-templates:${bomDependencyVersions['groovy.version']}",
-            'groovy-test'              : "org.apache.groovy:groovy-test:${bomDependencyVersions['groovy.version']}",
-            'groovy-test-junit5'       : "org.apache.groovy:groovy-test-junit5:${bomDependencyVersions['groovy.version']}",
-            'groovy-testng'            : "org.apache.groovy:groovy-testng:${bomDependencyVersions['groovy.version']}",
-            'groovy-toml'              : "org.apache.groovy:groovy-toml:${bomDependencyVersions['groovy.version']}",
-            'groovy-typecheckers'      : "org.apache.groovy:groovy-typecheckers:${bomDependencyVersions['groovy.version']}",
-            'groovy-xml'               : "org.apache.groovy:groovy-xml:${bomDependencyVersions['groovy.version']}",
-            'groovy-yaml'              : "org.apache.groovy:groovy-yaml:${bomDependencyVersions['groovy.version']}",
+            'groovy'                : "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}",
+            'groovy-ant'            : "org.apache.groovy:groovy-ant:${bomDependencyVersions['groovy.version']}",
+            'groovy-astbuilder'     : "org.apache.groovy:groovy-astbuilder:${bomDependencyVersions['groovy.version']}",
+            'groovy-cli-commons'    : "org.apache.groovy:groovy-cli-commons:${bomDependencyVersions['groovy.version']}",
+            'groovy-cli-picocli'    : "org.apache.groovy:groovy-cli-picocli:${bomDependencyVersions['groovy.version']}",
+            'groovy-console'        : "org.apache.groovy:groovy-console:${bomDependencyVersions['groovy.version']}",
+            'groovy-contracts'      : "org.apache.groovy:groovy-contracts:${bomDependencyVersions['groovy.version']}",
+            'groovy-datetime'       : "org.apache.groovy:groovy-datetime:${bomDependencyVersions['groovy.version']}",
+            'groovy-dateutil'       : "org.apache.groovy:groovy-dateutil:${bomDependencyVersions['groovy.version']}",
+            'groovy-docgenerator'   : "org.apache.groovy:groovy-docgenerator:${bomDependencyVersions['groovy.version']}",
+            'groovy-ginq'           : "org.apache.groovy:groovy-ginq:${bomDependencyVersions['groovy.version']}",
+            'groovy-groovydoc'      : "org.apache.groovy:groovy-groovydoc:${bomDependencyVersions['groovy.version']}",
+            'groovy-groovysh'       : "org.apache.groovy:groovy-groovysh:${bomDependencyVersions['groovy.version']}",
+            'groovy-jmx'            : "org.apache.groovy:groovy-jmx:${bomDependencyVersions['groovy.version']}",
+            'groovy-json'           : "org.apache.groovy:groovy-json:${bomDependencyVersions['groovy.version']}",
+            'groovy-jsr223'         : "org.apache.groovy:groovy-jsr223:${bomDependencyVersions['groovy.version']}",
+            'groovy-macro'          : "org.apache.groovy:groovy-macro:${bomDependencyVersions['groovy.version']}",
+            'groovy-macro-library'  : "org.apache.groovy:groovy-macro-library:${bomDependencyVersions['groovy.version']}",
+            'groovy-nio'            : "org.apache.groovy:groovy-nio:${bomDependencyVersions['groovy.version']}",
+            'groovy-servlet'        : "org.apache.groovy:groovy-servlet:${bomDependencyVersions['groovy.version']}",
+            'groovy-sql'            : "org.apache.groovy:groovy-sql:${bomDependencyVersions['groovy.version']}",
+            'groovy-swing'          : "org.apache.groovy:groovy-swing:${bomDependencyVersions['groovy.version']}",
+            'groovy-templates'      : "org.apache.groovy:groovy-templates:${bomDependencyVersions['groovy.version']}",
+            'groovy-test'           : "org.apache.groovy:groovy-test:${bomDependencyVersions['groovy.version']}",
+            'groovy-test-junit5'    : "org.apache.groovy:groovy-test-junit5:${bomDependencyVersions['groovy.version']}",
+            'groovy-testng'         : "org.apache.groovy:groovy-testng:${bomDependencyVersions['groovy.version']}",
+            'groovy-toml'           : "org.apache.groovy:groovy-toml:${bomDependencyVersions['groovy.version']}",
+            'groovy-typecheckers'   : "org.apache.groovy:groovy-typecheckers:${bomDependencyVersions['groovy.version']}",
+            'groovy-xml'            : "org.apache.groovy:groovy-xml:${bomDependencyVersions['groovy.version']}",
+            'groovy-yaml'           : "org.apache.groovy:groovy-yaml:${bomDependencyVersions['groovy.version']}",
+            'hibernate-groovy-proxy': "org.yakworks:hibernate-groovy-proxy:${bomDependencyVersions['hibernate-groovy-proxy.version']}",
             // end - restate the groovy-bom here because the spring dependency management
             // start - restate versions managed by Spring Boot / Spock BOMs so enforcedPlatform can enforce them
             // when micronaut is used (Micronaut 5 platform declares higher versions that override preferences)
-            'kotlin-stdlib'            : "org.jetbrains.kotlin:kotlin-stdlib:${bomDependencyVersions['kotlin.version']}",
-            'kotlin-stdlib-common'     : "org.jetbrains.kotlin:kotlin-stdlib-common:${bomDependencyVersions['kotlin.version']}",
-            'kotlin-stdlib-jdk7'       : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${bomDependencyVersions['kotlin.version']}",
-            'kotlin-stdlib-jdk8'       : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${bomDependencyVersions['kotlin.version']}",
-            'mockito-core'             : "org.mockito:mockito-core:${bomDependencyVersions['mockito.version']}",
-            'spock-core'               : "org.spockframework:spock-core:${bomDependencyVersions['spock.version']}",
-            'spock-spring'             : "org.spockframework:spock-spring:${bomDependencyVersions['spock.version']}",
+            'kotlin-stdlib'         : "org.jetbrains.kotlin:kotlin-stdlib:${bomDependencyVersions['kotlin.version']}",
+            'kotlin-stdlib-common'  : "org.jetbrains.kotlin:kotlin-stdlib-common:${bomDependencyVersions['kotlin.version']}",
+            'kotlin-stdlib-jdk7'    : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${bomDependencyVersions['kotlin.version']}",
+            'kotlin-stdlib-jdk8'    : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${bomDependencyVersions['kotlin.version']}",
+            'mockito-core'          : "org.mockito:mockito-core:${bomDependencyVersions['mockito.version']}",
+            'spock-core'            : "org.spockframework:spock-core:${bomDependencyVersions['spock.version']}",
+            'spock-spring'          : "org.spockframework:spock-spring:${bomDependencyVersions['spock.version']}",
             // end - restate versions managed by inherited BOMs
-            'jquery'                   : "org.webjars.npm:jquery:${bomDependencyVersions['jquery.version']}",
-            'mongodb-bson'             : "org.mongodb:bson:${bomDependencyVersions['mongodb.version']}",
-            'mongodb-driver-core'      : "org.mongodb:mongodb-driver-core:${bomDependencyVersions['mongodb.version']}",
-            'mongodb-driver-sync'      : "org.mongodb:mongodb-driver-sync:${bomDependencyVersions['mongodb.version']}",
-            'mongodb-record-codec'     : "org.mongodb:bson-record-codec:${bomDependencyVersions['mongodb.version']}",
-            'rxjava'                   : "io.reactivex:rxjava:${bomDependencyVersions['rxjava.version']}",
-            'rxjava2'                  : "io.reactivex.rxjava2:rxjava:${bomDependencyVersions['rxjava2.version']}",
-            'rxjava3'                  : "io.reactivex.rxjava3:rxjava:${bomDependencyVersions['rxjava3.version']}",
-            'sitemesh'                 : "opensymphony:sitemesh:${bomDependencyVersions['sitemesh.version']}",
-            'starter-sitemesh'         : "org.sitemesh:spring-boot-starter-sitemesh:${bomDependencyVersions['starter-sitemesh.version']}",
-            'spring-retry'             : "org.springframework.retry:spring-retry:${bomDependencyVersions['spring-retry.version']}",
+            'jquery'                : "org.webjars.npm:jquery:${bomDependencyVersions['jquery.version']}",
+            'mongodb-bson'          : "org.mongodb:bson:${bomDependencyVersions['mongodb.version']}",
+            'mongodb-driver-core'   : "org.mongodb:mongodb-driver-core:${bomDependencyVersions['mongodb.version']}",
+            'mongodb-driver-sync'   : "org.mongodb:mongodb-driver-sync:${bomDependencyVersions['mongodb.version']}",
+            'mongodb-record-codec'  : "org.mongodb:bson-record-codec:${bomDependencyVersions['mongodb.version']}",
+            'rxjava'                : "io.reactivex:rxjava:${bomDependencyVersions['rxjava.version']}",
+            'rxjava2'               : "io.reactivex.rxjava2:rxjava:${bomDependencyVersions['rxjava2.version']}",
+            'rxjava3'               : "io.reactivex.rxjava3:rxjava:${bomDependencyVersions['rxjava3.version']}",
+            'sitemesh'              : "opensymphony:sitemesh:${bomDependencyVersions['sitemesh.version']}",
+            'starter-sitemesh'      : "org.sitemesh:spring-boot-starter-sitemesh:${bomDependencyVersions['starter-sitemesh.version']}",
+            'spring-retry'          : "org.springframework.retry:spring-retry:${bomDependencyVersions['spring-retry.version']}",
     ]
 
     // Because pom exclusions aren't properly supported by gradle, we can't inherit the grails-gradle-bom
@@ -177,28 +179,79 @@ ext {
     // BOM projects (grails-bom, grails-hibernate7-bom) to avoid conflicting version constraints
     // when both hibernate5 and hibernate7 versions of liquibase-core appear in the same map.
     // These use gradle.properties values which are only available in the root project context.
-    if (project.hasProperty('liquibaseHibernate5Version')) {
-        combinedVersions += [
-                'liquibase-hibernate5.version': liquibaseHibernate5Version,
-                'liquibase.version'      : liquibaseHibernate5CoreVersion,
+    if (project.name in ['grails-bom', 'grails-hibernate5-bom'] || project.name.startsWith('grails-data-hibernate5')) {
+        customBomVersions = [
+                'liquibase-hibernate.version': '4.27.0',
+                'liquibase.version'          : '4.27.0',
+                'hibernate.version'          : '5.6.15.Final',
         ]
-        combinedDependencies += [
-                'liquibase'           : "org.liquibase:liquibase:$liquibaseHibernate5CoreVersion",
-                'liquibase-cdi'       : "org.liquibase:liquibase-cdi:$liquibaseHibernate5CoreVersion",
-                'liquibase-core'      : "org.liquibase:liquibase-core:$liquibaseHibernate5CoreVersion",
-                'liquibase-hibernate5': "org.liquibase.ext:liquibase-hibernate5:$liquibaseHibernate5Version",
+        combinedVersions += customBomVersions
+        customBomDependencies = [
+                'liquibase'             : "org.liquibase:liquibase:${combinedVersions['liquibase.version']}",
+                'liquibase-cdi'         : "org.liquibase:liquibase-cdi:${combinedVersions['liquibase.version']}",
+                'liquibase-core'        : "org.liquibase:liquibase-core:${combinedVersions['liquibase.version']}",
+                'liquibase-hibernate'   : "org.liquibase.ext:liquibase-hibernate5:${combinedVersions['liquibase-hibernate.version']}",
+                'hibernate-core-jakarta': "org.hibernate:hibernate-core-jakarta:${combinedVersions['hibernate.version']}",
+                'hibernate-ehcache'     : "org.hibernate:hibernate-ehcache:${combinedVersions['hibernate.version']}",
         ]
-    }
-    if (project.hasProperty('liquibaseHibernate7Version')) {
-        combinedVersions += [
-                'liquibase-hibernate7.version': liquibaseHibernate7Version,
-                'liquibase.version'      : liquibaseHibernate7CoreVersion,
+        combinedDependencies += customBomDependencies
+
+        // Gradle will not use the version property that gets written out to overwrite the spring bom, so force the version here
+        // exclusion support would be real nice ... maven 4.0 only though
+//        configurations.configureEach {
+//            resolutionStrategy.eachDependency { details ->
+//                if (details.requested.group == 'org.liquibase') {
+//                    details.useVersion "${combinedVersions['liquibase.version']}"
+//                    details.because 'Force liquibase version to match Grails Hibernate 5 requirements'
+//                }
+//                if (details.requested.group == 'org.hibernate') {
+//                    details.useVersion "${combinedVersions['hibernate.version']}"
+//                    details.because 'Force hibernate version to match Grails Hibernate 5 requirements'
+//                }
+//            }
+//        }
+    } else if (project.name in ['grails-hibernate7-bom'] || project.name.startsWith('grails-data-hibernate7')) {
+        customBomVersions = [
+                'cache-ri-impl.version'         : '1.1.1',
+                'hibernate-models.version'      : '1.0.1',
+                'hibernate.version'             : '7.2.5.Final',
+                'jandex.version'                : '3.2.3',
+                'liquibase-hibernate.version'   : '4.27.0',
+                'liquibase-test-harness.version': '1.0.11',
+                'liquibase.version'             : '4.27.0',
+                'mockito-inline.version'        : '5.2.0',
         ]
-        combinedDependencies += [
-                'liquibase'           : "org.liquibase:liquibase:$liquibaseHibernate7CoreVersion",
-                'liquibase-cdi'       : "org.liquibase:liquibase-cdi:$liquibaseHibernate7CoreVersion",
-                'liquibase-core'      : "org.liquibase:liquibase-core:$liquibaseHibernate7CoreVersion",
-                'liquibase-hibernate7': "org.liquibase.ext:liquibase-hibernate7:$liquibaseHibernate7Version",
+        combinedVersions += customBomVersions
+        customBomDependencies = [
+                'cache-ri-impl'         : "org.jsr107.ri:cache-ri-impl:${combinedVersions['cache-ri-impl.version']}",
+                'hibernate-core'        : "org.hibernate.orm:hibernate-core:${combinedVersions['hibernate.version']}",
+                'hibernate-jcache'        : "org.hibernate.orm:hibernate-jcache:${combinedVersions['hibernate.version']}",
+                'hibernate-models'      : "org.hibernate.models:hibernate-models:${combinedVersions['hibernate-models.version']}",
+                'hibernate-tools-orm'   : "org.hibernate.tool:hibernate-tools-orm:${combinedVersions['hibernate.version']}",
+                'hibernate-tools-utils' : "org.hibernate.tool:hibernate-tools-utils:${combinedVersions['hibernate.version']}",
+                'jandex'                : "io.smallrye:jandex:${combinedVersions['jandex.version']}",
+                'liquibase'             : "org.liquibase:liquibase:${combinedVersions['liquibase.version']}",
+                'liquibase-cdi'         : "org.liquibase:liquibase-cdi:${combinedVersions['liquibase.version']}",
+                'liquibase-core'        : "org.liquibase:liquibase-core:${combinedVersions['liquibase.version']}",
+                'liquibase-hibernate'   : "org.liquibase.ext:liquibase-hibernate7:${combinedVersions['liquibase-hibernate.version']}",
+                'liquibase-test-harness': "org.liquibase:liquibase-test-harness:${combinedVersions['liquibase-test-harness.version']}",
+                'mockito-inline'        : "org.mockito:mockito-inline:${combinedVersions['mockito-inline.version']}",
         ]
+        combinedDependencies += customBomDependencies
+
+        // Gradle will not use the version property that gets written out to overwrite the spring bom, so force the version here
+        // exclusion support would be real nice ... maven 4.0 only though
+//        configurations.configureEach {
+//            resolutionStrategy.eachDependency { details ->
+//                if (details.requested.group == 'org.liquibase') {
+//                    details.useVersion "${combinedVersions['liquibase.version']}"
+//                    details.because 'Force liquibase version to match Grails Hibernate 5 requirements'
+//                }
+//                if (details.requested.group == 'org.hibernate') {
+//                    details.useVersion "${combinedVersions['hibernate.version']}"
+//                    details.because 'Force hibernate version to match Grails Hibernate 5 requirements'
+//                }
+//            }
+//        }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 2ffd360096..4dae2a8d7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,21 +35,14 @@ gparsVersion=1.2.1
 # Keep gradle version synced with .sdkmanrc, all gradle-wrapper.properties files,
 # and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
 gradleToolingApiVersion=8.14.4
-hibernate5Version=5.6.15.Final
-hibernate7Version=7.2.5.Final
 javassistVersion=3.30.2-GA
 jnrPosixVersion=3.1.20
 joddWotVersion=3.3.8
 joptSimpleVersion=5.0.4
 jspApiVersion=4.0.0
-liquibaseHibernate5Version=4.27.0
-liquibaseHibernate5CoreVersion=4.27.0
-liquibaseHibernate7CoreVersion=4.27.0
-liquibaseHibernate7Version=4.27.0
 openTest4jVersion=1.3.0
 picocliVersion=4.7.6
 slf4jVersion=2.0.17
-yakworksHibernateGroovyProxyVersion=1.1
 
 # Build dependency versions not managed by BOMs
 apacheRatVersion=0.8.1
diff --git a/gradle/publish-root-config.gradle b/gradle/publish-root-config.gradle
index 27528b2e11..4382046201 100644
--- a/gradle/publish-root-config.gradle
+++ b/gradle/publish-root-config.gradle
@@ -30,6 +30,7 @@ def publishedProjects = [
         'grails-async-rxjava',
         'grails-async-rxjava2',
         'grails-async-rxjava3',
+        'grails-base-bom',
         'grails-bom',
         'grails-hibernate5-bom',
         'grails-hibernate7-bom',
diff --git a/gradle/rat-root-config.gradle b/gradle/rat-root-config.gradle
index b3a256aad5..ff862ea1cf 100644
--- a/gradle/rat-root-config.gradle
+++ b/gradle/rat-root-config.gradle
@@ -75,8 +75,6 @@ tasks.named('rat') {
             'grails-forge/**/src/main/resources/**', // src/main/resources are included in generated application and should not include a license
             'grails-forge/**/src/test/resources/**', // src/test/resources are used in tests against files included in generated application and should not include a license
             'grails-gradle/**/build/**', // grails-gradle does not have a build package name so exclude any build directories
-            '*/build/**', // any build directories at the root
-            'grails-test-examples/**/build/**', // grails-test-examples build directories
             'grails-forge/*/build/**', // grails-forge build directories
             'grails-forge/build/**', // grails-forge build directories
             'build-logic/build/**', // grails-forge build directories
@@ -85,14 +83,6 @@ tasks.named('rat') {
             'build-logic/.idea/**', // grails-gradle idea directories
             'build/**', // build directories
             'buildSrc/build/**', // build directories
-            '**/build/**', // all build directories
-            'node_modules/**', // node modules
-            'local.properties', // local properties
-            'test_output.log', // test output log
-            '0_build_grails.txt', // large build log
-            '*_VIOLATIONS.md', // generated violation reports
-            'plans/*.md', // development plans
-            'grails-data-hibernate7/*.md', // hibernate 7 migration docs
     ] + rootProject.subprojects.collect{"${rootProject.projectDir.relativePath(it.layout.buildDirectory.get().asFile).toString()}/**/*" }
     // logger.lifecycle("Excludes for RAT task: ${allExcludes.join(', \n')}")
     excludes = allExcludes
diff --git a/grails-bom/README.md b/grails-bom/README.md
deleted file mode 100644
index edafad5a59..0000000000
--- a/grails-bom/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-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.
--->
-
-## grails-bom
-
-Build support for generating the Maven bill of materials.
diff --git a/grails-bom/build.gradle b/grails-bom/base/build.gradle
similarity index 93%
copy from grails-bom/build.gradle
copy to grails-bom/base/build.gradle
index 5e5e8b91ff..5fcbe05e40 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/base/build.gradle
@@ -54,12 +54,13 @@ dependencies {
     api platform(gradleBomPlatformDependencies['spring-boot-bom']), {
         exclude group: 'org.apache.groovy'
         exclude group: 'org.spockframework'
+        exclude group: 'org.liquibase'
+        exclude group: 'org.hibernate'
     }
 
     for (def entry : bomPlatformDependencies.entrySet()) {
         api platform(entry.value)
     }
-    api platform(gradleBomPlatformDependencies['testcontainers-bom'])
 
     constraints {
         for (def entry : gradleBomDependencies.entrySet()) {
@@ -91,27 +92,6 @@ dependencies {
         for (Map.Entry<String, String> dependency : project.ext.gradleBuildProjects.entrySet()) {
             api "${dependency.value}:${dependency.key}:${projectVersion}"
         }
-
-        api("org.liquibase:liquibase") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        api("org.liquibase:liquibase-cdi") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        api("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        api("org.liquibase.ext:liquibase-hibernate5") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
     }
 }
 
diff --git a/grails-bom/build.gradle b/grails-bom/default/build.gradle
similarity index 77%
rename from grails-bom/build.gradle
rename to grails-bom/default/build.gradle
index 5e5e8b91ff..a32137255f 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/default/build.gradle
@@ -51,65 +51,19 @@ ext {
 }
 
 dependencies {
-    api platform(gradleBomPlatformDependencies['spring-boot-bom']), {
-        exclude group: 'org.apache.groovy'
-        exclude group: 'org.spockframework'
-    }
-
-    for (def entry : bomPlatformDependencies.entrySet()) {
-        api platform(entry.value)
-    }
-    api platform(gradleBomPlatformDependencies['testcontainers-bom'])
+    api platform(project(':grails-base-bom'))
 
     constraints {
-        for (def entry : gradleBomDependencies.entrySet()) {
-            api entry.value
-        }
-        for (def entry : bomDependencies.entrySet()) {
-            api entry.value
-        }
-
-        for (Project subproject : rootProject.subprojects) {
-            if (subproject.path == project.path || subproject.name in testProjects || subproject.name in docProjects || subproject.name in cliProjects) {
-                continue // ignore self & test projects
-            }
-
-            // skip other java-platform (BOM) projects - they are not library dependencies
-            if (subproject.pluginManager.hasPlugin('java-platform')) {
-                continue
-            }
-
-            boolean publishedProject = subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish-profile') || subproject.pluginManager.hasPlugin('org.apache.grails.gradle.grails-publish')
-            if (!publishedProject) {
-                continue
-            }
-
-            api project(":${subproject.path}")
-        }
-
-        // since we're duplicating the bom instead of inheriting we have to add the grails-gradle projects
-        for (Map.Entry<String, String> dependency : project.ext.gradleBuildProjects.entrySet()) {
-            api "${dependency.value}:${dependency.key}:${projectVersion}"
-        }
-
-        api("org.liquibase:liquibase") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        api("org.liquibase:liquibase-cdi") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        api("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        api("org.liquibase.ext:liquibase-hibernate5") {
-            version {
-                strictly "$liquibaseHibernate5Version"
+        for (def entry : customBomDependencies.entrySet()) {
+            def parts = entry.value.split(':')
+            if (parts.length == 3) {
+                api("${parts[0]}:${parts[1]}") {
+                    version {
+                        strictly parts[2]
+                    }
+                }
+            } else {
+                api entry.value
             }
         }
     }
diff --git a/grails-hibernate5-bom/build.gradle b/grails-bom/hibernate5/build.gradle
similarity index 70%
rename from grails-hibernate5-bom/build.gradle
rename to grails-bom/hibernate5/build.gradle
index 8ce4e6a941..dd129557a6 100644
--- a/grails-hibernate5-bom/build.gradle
+++ b/grails-bom/hibernate5/build.gradle
@@ -28,6 +28,7 @@ buildscript {
 plugins {
     id 'java-platform'
     id 'org.apache.grails.buildsrc.publish'
+    id 'org.apache.grails.buildsrc.sbom'
 }
 
 version = projectVersion
@@ -38,12 +39,34 @@ javaPlatform {
 }
 
 ext {
-    gradleBuildProjects = project(':grails-bom').ext.gradleBuildProjects
+    isReleaseBuild = System.getenv('GRAILS_PUBLISH_RELEASE') == 'true'
+    isPublishedExternal = System.getenv().containsKey('NEXUS_PUBLISH_STAGING_PROFILE_ID')
+    // TODO: It should be possible to pull these build names using includedBuild, but I haven't found a way to do so
+    gradleBuildProjects = [
+            'grails-gradle-plugins':'org.apache.grails',
+            'grails-gradle-model':'org.apache.grails.gradle',
+            'grails-gradle-common':'org.apache.grails.gradle',
+            'grails-gradle-tasks':'org.apache.grails',
+    ]
 }
 
 dependencies {
-    // Inherit everything from the default grails-bom which already uses hibernate5-compatible liquibase versions
     api platform(project(':grails-bom'))
+
+    constraints {
+        for (def entry : customBomDependencies.entrySet()) {
+            def parts = entry.value.split(':')
+            if (parts.length == 3) {
+                api("${parts[0]}:${parts[1]}") {
+                    version {
+                        strictly parts[2]
+                    }
+                }
+            } else {
+                api entry.value
+            }
+        }
+    }
 }
 
 configurations.register('bomDependencies').configure {
@@ -83,7 +106,7 @@ tasks.register('extractConstraints', ExtractDependenciesTask).configure { Extrac
         rootProject.subprojects.each { p ->
             String artifactId = p.findProperty('pomArtifactId') as String ?: p.name
             String baseVersionName = artifactId.replaceAll('[.]', '-')
-            projectCoordinates["${p.group}:${artifactId}:${p.version}" as String] = baseVersionName
+            projectCoordinates["${p.group}:${ artifactId}:${p.version}" as String] = baseVersionName
         }
 
         for (Map.Entry<String, String> dependency : project.ext.gradleBuildProjects.entrySet()) {
@@ -96,6 +119,33 @@ tasks.register('extractConstraints', ExtractDependenciesTask).configure { Extrac
     it.dependsOn(project.tasks.named('generateMetadataFileForMavenPublication'), project.tasks.named('generatePomFileForMavenPublication'))
 }
 
+def validateNoSnapshotDependencies = tasks.register('validateNoSnapshotDependencies')
+validateNoSnapshotDependencies.configure { Task it ->
+    it.group = 'publishing'
+    it.description = 'Validates that no snapshot dependencies are present in the project when performing a release.'
+
+    it.doLast {
+        configurations.each { config ->
+            config.allDependencies.each { dep ->
+                if (dep.version && dep.version.contains('-SNAPSHOT')) {
+                    throw new GradleException("Releases cannot have a snapshot dependency: ${dep.group}:${dep.name} (${dep.version})")
+                }
+            }
+        }
+    }
+}
+
+if (ext.isReleaseBuild && ext.isPublishedExternal) {
+    project.afterEvaluate {
+        tasks.named('generateMetadataFileForMavenPublication').configure {
+            dependsOn(validateNoSnapshotDependencies)
+        }
+        tasks.named('generatePomFileForMavenPublication').configure {
+            dependsOn(validateNoSnapshotDependencies)
+        }
+    }
+}
+
 ext {
     pomDescription = 'Grails Hibernate 5 BOM (Bill of Materials) for managing dependency versions used by Grails Projects with Hibernate 5'
     pomCustomization = { xml ->
@@ -127,7 +177,11 @@ ext {
                 if (inlineVersion) {
                     ExtractedDependencyConstraint extractedConstraint = propertyNameCalculator.calculate(groupId, artifactId, inlineVersion, isBom)
                     if (extractedConstraint?.versionPropertyReference) {
+                        // use the property reference instead of the hard coded version so that it can be
+                        // overriden by the spring boot dependency management plugin
                         dep.version[0].value = extractedConstraint.versionPropertyReference
+
+                        // Add an entry in the <properties> node with the actual version number
                         pomProperties.put(extractedConstraint.versionPropertyName, inlineVersion)
                     }
                 } else if (!inlineVersion) {
diff --git a/grails-hibernate7-bom/build.gradle b/grails-bom/hibernate7/build.gradle
similarity index 70%
rename from grails-hibernate7-bom/build.gradle
rename to grails-bom/hibernate7/build.gradle
index 4adf6c31c1..61a04459d4 100644
--- a/grails-hibernate7-bom/build.gradle
+++ b/grails-bom/hibernate7/build.gradle
@@ -28,6 +28,7 @@ buildscript {
 plugins {
     id 'java-platform'
     id 'org.apache.grails.buildsrc.publish'
+    id 'org.apache.grails.buildsrc.sbom'
 }
 
 version = projectVersion
@@ -38,33 +39,31 @@ javaPlatform {
 }
 
 ext {
-    gradleBuildProjects = project(':grails-bom').ext.gradleBuildProjects
+    isReleaseBuild = System.getenv('GRAILS_PUBLISH_RELEASE') == 'true'
+    isPublishedExternal = System.getenv().containsKey('NEXUS_PUBLISH_STAGING_PROFILE_ID')
+    // TODO: It should be possible to pull these build names using includedBuild, but I haven't found a way to do so
+    gradleBuildProjects = [
+            'grails-gradle-plugins':'org.apache.grails',
+            'grails-gradle-model':'org.apache.grails.gradle',
+            'grails-gradle-common':'org.apache.grails.gradle',
+            'grails-gradle-tasks':'org.apache.grails',
+    ]
 }
 
 dependencies {
-    // Inherit everything from the default grails-bom
-    api platform(project(':grails-bom'))
+    api platform(project(':grails-base-bom'))
 
-    // Override liquibase dependencies for Hibernate 7 compatibility
     constraints {
-        api("org.liquibase:liquibase") {
-            version {
-                strictly "$liquibaseHibernate7CoreVersion"
-            }
-        }
-        api("org.liquibase:liquibase-cdi") {
-            version {
-                strictly "$liquibaseHibernate7CoreVersion"
-            }
-        }
-        api("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate7CoreVersion"
-            }
-        }
-        api("org.liquibase.ext:liquibase-hibernate7") {
-            version {
-                strictly "$liquibaseHibernate7Version"
+        for (def entry : customBomDependencies.entrySet()) {
+            def parts = entry.value.split(':')
+            if (parts.length == 3) {
+                api("${parts[0]}:${parts[1]}") {
+                    version {
+                        strictly parts[2]
+                    }
+                }
+            } else {
+                api entry.value
             }
         }
     }
@@ -107,7 +106,7 @@ tasks.register('extractConstraints', ExtractDependenciesTask).configure { Extrac
         rootProject.subprojects.each { p ->
             String artifactId = p.findProperty('pomArtifactId') as String ?: p.name
             String baseVersionName = artifactId.replaceAll('[.]', '-')
-            projectCoordinates["${p.group}:${artifactId}:${p.version}" as String] = baseVersionName
+            projectCoordinates["${p.group}:${ artifactId}:${p.version}" as String] = baseVersionName
         }
 
         for (Map.Entry<String, String> dependency : project.ext.gradleBuildProjects.entrySet()) {
@@ -120,6 +119,33 @@ tasks.register('extractConstraints', ExtractDependenciesTask).configure { Extrac
     it.dependsOn(project.tasks.named('generateMetadataFileForMavenPublication'), project.tasks.named('generatePomFileForMavenPublication'))
 }
 
+def validateNoSnapshotDependencies = tasks.register('validateNoSnapshotDependencies')
+validateNoSnapshotDependencies.configure { Task it ->
+    it.group = 'publishing'
+    it.description = 'Validates that no snapshot dependencies are present in the project when performing a release.'
+
+    it.doLast {
+        configurations.each { config ->
+            config.allDependencies.each { dep ->
+                if (dep.version && dep.version.contains('-SNAPSHOT')) {
+                    throw new GradleException("Releases cannot have a snapshot dependency: ${dep.group}:${dep.name} (${dep.version})")
+                }
+            }
+        }
+    }
+}
+
+if (ext.isReleaseBuild && ext.isPublishedExternal) {
+    project.afterEvaluate {
+        tasks.named('generateMetadataFileForMavenPublication').configure {
+            dependsOn(validateNoSnapshotDependencies)
+        }
+        tasks.named('generatePomFileForMavenPublication').configure {
+            dependsOn(validateNoSnapshotDependencies)
+        }
+    }
+}
+
 ext {
     pomDescription = 'Grails Hibernate 7 BOM (Bill of Materials) for managing dependency versions used by Grails Projects with Hibernate 7'
     pomCustomization = { xml ->
@@ -151,7 +177,11 @@ ext {
                 if (inlineVersion) {
                     ExtractedDependencyConstraint extractedConstraint = propertyNameCalculator.calculate(groupId, artifactId, inlineVersion, isBom)
                     if (extractedConstraint?.versionPropertyReference) {
+                        // use the property reference instead of the hard coded version so that it can be
+                        // overriden by the spring boot dependency management plugin
                         dep.version[0].value = extractedConstraint.versionPropertyReference
+
+                        // Add an entry in the <properties> node with the actual version number
                         pomProperties.put(extractedConstraint.versionPropertyName, inlineVersion)
                     }
                 } else if (!inlineVersion) {
diff --git a/grails-data-hibernate5/core/build.gradle b/grails-data-hibernate5/core/build.gradle
index 195324c193..dd3a32be4d 100644
--- a/grails-data-hibernate5/core/build.gradle
+++ b/grails-data-hibernate5/core/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     api project(':grails-data-hibernate5-spring-orm')
     api 'org.springframework:spring-orm'
     compileOnly 'jakarta.servlet:jakarta.servlet-api'
-    api "org.hibernate:hibernate-core-jakarta:$hibernate5Version", {
+    api "org.hibernate:hibernate-core-jakarta", {
         exclude group:'commons-logging', module:'commons-logging'
         exclude group:'com.h2database', module:'h2'
         exclude group:'commons-collections', module:'commons-collections'
@@ -72,12 +72,12 @@ dependencies {
     testImplementation 'org.apache.groovy:groovy-json'
     testImplementation 'org.apache.tomcat:tomcat-jdbc'
     testImplementation 'org.spockframework:spock-core'
-    testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
+    testImplementation 'org.yakworks:hibernate-groovy-proxy', {
         // groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass
         exclude group: 'org.codehaus.groovy', module: 'groovy'
     }
 
-    testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    testRuntimeOnly "org.hibernate:hibernate-ehcache", {
         // exclude javax variant of hibernate-core 5.6
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-data-hibernate5/dbmigration/build.gradle b/grails-data-hibernate5/dbmigration/build.gradle
index 4a3e6174f1..c4f5c80f2f 100644
--- a/grails-data-hibernate5/dbmigration/build.gradle
+++ b/grails-data-hibernate5/dbmigration/build.gradle
@@ -38,14 +38,12 @@ ext {
 
 dependencies {
     // TODO: Clarify and clean up dependencies
-    implementation platform(project(':grails-bom')) {
-        exclude group: 'org.liquibase', module: 'liquibase-core'
-    }
+    implementation platform(project(':grails-hibernate5-bom'))
 
-    implementation("org.liquibase:liquibase-core:$liquibaseHibernate5CoreVersion") {
+    implementation("org.liquibase:liquibase-core") {
         exclude group: 'javax.xml.bind', module: 'jaxb-api'
     }
-    implementation("org.liquibase.ext:liquibase-hibernate5:$liquibaseHibernate5Version") {
+    implementation("org.liquibase.ext:liquibase-hibernate5") {
         exclude group: 'org.hibernate', module: 'hibernate-core'
         exclude group: 'org.hibernate', module: 'hibernate-entitymanager'
         exclude group: 'org.hibernate', module: 'hibernate-envers'
@@ -76,19 +74,6 @@ dependencies {
     testImplementation project(':grails-testing-support-datamapping')
     testImplementation project(':grails-testing-support-web')
     testImplementation 'com.h2database:h2'
-
-    constraints {
-        implementation("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-        implementation("org.liquibase.ext:liquibase-hibernate5") {
-            version {
-                strictly "$liquibaseHibernate5Version"
-            }
-        }
-    }
 }
 
 tasks.named('jar', Jar) {
diff --git a/grails-data-hibernate5/docs/build.gradle b/grails-data-hibernate5/docs/build.gradle
index 2a3b6d7cd1..9792d970a7 100644
--- a/grails-data-hibernate5/docs/build.gradle
+++ b/grails-data-hibernate5/docs/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     documentation project(':grails-bootstrap')
     documentation project(':grails-core')
     documentation project(':grails-spring')
-    documentation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
+    documentation 'org.hibernate:hibernate-core-jakarta'
     coreProjects.each {
         documentation "org.apache.grails.data:$it"
     }
@@ -85,7 +85,6 @@ tasks.named('asciidoctor', AsciidoctorTask) { AsciidoctorTask it ->
             'migrationPluginExamplesDir': project.layout.projectDirectory.dir('src/docs/asciidoc/databaseMigration').asFile.relativePath(rootProject.findProject(':grails-data-hibernate5-dbmigration').layout.projectDirectory.asFile),
             'migrationPluginGroupId'    : rootProject.findProject(':grails-data-hibernate5-dbmigration').group,
             'migrationPluginArtifactId' : rootProject.findProject(':grails-data-hibernate5-dbmigration').name,
-            'liquibaseHibernate5Version': liquibaseHibernate5Version
     ]
 }
 
diff --git a/grails-data-hibernate5/docs/src/docs/asciidoc/databaseMigration/gettingStarted.adoc b/grails-data-hibernate5/docs/src/docs/asciidoc/databaseMigration/gettingStarted.adoc
index 3292fa7750..0e215c9fc1 100644
--- a/grails-data-hibernate5/docs/src/docs/asciidoc/databaseMigration/gettingStarted.adoc
+++ b/grails-data-hibernate5/docs/src/docs/asciidoc/databaseMigration/gettingStarted.adoc
@@ -42,8 +42,9 @@ It is also recommended to add a direct dependency to liquibase because Spring Bo
 ----
 dependencies {
    ...
-     implementation "org.liquibase:liquibase-core:{liquibaseHibernate5Version}"
-     implementation "org.liquibase.ext:liquibase-hibernate5:{liquibaseHibernate5Version}"
+     implementation platform('grails-hibernate5-bom')
+     implementation "org.liquibase:liquibase-core"
+     implementation "org.liquibase.ext:liquibase-hibernate5"
 }
 ----
 
diff --git a/grails-data-hibernate5/grails-plugin/build.gradle b/grails-data-hibernate5/grails-plugin/build.gradle
index 48ac6effbd..26aa0d4b48 100644
--- a/grails-data-hibernate5/grails-plugin/build.gradle
+++ b/grails-data-hibernate5/grails-plugin/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 
     api "org.springframework.boot:spring-boot"
     api "org.springframework:spring-orm"
-    api "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
+    api 'org.hibernate:hibernate-core-jakarta'
     api project(":grails-datastore-web")
     api project(":grails-datamapping-support")
     api project(":grails-data-hibernate5-core"), {
@@ -71,7 +71,7 @@ dependencies {
 
     testRuntimeOnly 'com.h2database:h2'
     testRuntimeOnly 'org.apache.tomcat:tomcat-jdbc'
-    testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    testRuntimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core 5.6
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-data-hibernate5/spring-orm/build.gradle b/grails-data-hibernate5/spring-orm/build.gradle
index 3713dfb9cc..2c4b6289c3 100644
--- a/grails-data-hibernate5/spring-orm/build.gradle
+++ b/grails-data-hibernate5/spring-orm/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     api 'org.springframework:spring-beans'
     api 'org.springframework:spring-context'
     compileOnly 'jakarta.servlet:jakarta.servlet-api'
-    api "org.hibernate:hibernate-core-jakarta:${hibernate5Version}", {
+    api 'org.hibernate:hibernate-core-jakarta', {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.slf4j', module: 'slf4j-api'
     }
diff --git a/grails-data-hibernate7/boot-plugin/build.gradle b/grails-data-hibernate7/boot-plugin/build.gradle
index e1f3b16947..c83c2e9899 100644
--- a/grails-data-hibernate7/boot-plugin/build.gradle
+++ b/grails-data-hibernate7/boot-plugin/build.gradle
@@ -38,7 +38,7 @@ ext {
 
 dependencies {
     // TODO: Clarify and clean up dependencies
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     compileOnly project(':grails-shell-cli'), {
         exclude group:'org.apache.groovy', module:'groovy'
diff --git a/grails-data-hibernate7/core/build.gradle b/grails-data-hibernate7/core/build.gradle
index 98b5d30d18..c82f8af7a4 100644
--- a/grails-data-hibernate7/core/build.gradle
+++ b/grails-data-hibernate7/core/build.gradle
@@ -38,7 +38,7 @@ ext {
 
 dependencies {
     // TODO: Clarify and clean up dependencies
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     api 'org.slf4j:slf4j-api'
 
@@ -48,8 +48,8 @@ dependencies {
     api 'org.springframework:spring-orm'
     compileOnly 'org.springframework:spring-webmvc'
     compileOnly 'jakarta.servlet:jakarta.servlet-api'
-    implementation "net.bytebuddy:byte-buddy:1.18.7"
-    api "org.hibernate.orm:hibernate-core:$hibernate7Version", {
+    implementation "net.bytebuddy:byte-buddy"
+    api 'org.hibernate.orm:hibernate-core', {
         exclude group:'commons-logging', module:'commons-logging'
         exclude group:'com.h2database', module:'h2'
         exclude group:'commons-collections', module:'commons-collections'
@@ -58,21 +58,18 @@ dependencies {
         exclude group:'org.slf4j', module:'slf4j-log4j12'
         exclude group:'xml-apis', module:'xml-apis'
     }
-    api "org.hibernate.models:hibernate-models:1.0.0"
+    api "org.hibernate.models:hibernate-models"
     api 'org.hibernate.validator:hibernate-validator', {
         exclude group:'commons-logging', module:'commons-logging'
         exclude group:'commons-collections', module:'commons-collections'
         exclude group:'org.slf4j', module:'slf4j-api'
     }
-    api 'jakarta.validation:jakarta.validation-api:3.1.0'
-    api 'javax.validation:validation-api:2.0.1.Final'
-    api ('org.checkerframework:checker-qual:3.48.4')
-
-    api 'io.smallrye:jandex:3.2.3'
-
-    compileOnly "org.hibernate.orm:hibernate-core:$hibernate7Version"
+    api 'jakarta.validation:jakarta.validation-api'
+    api 'org.checkerframework:checker-qual'
 
+    api 'io.smallrye:jandex'
 
+    compileOnly 'org.hibernate.orm:hibernate-core'
     compileOnly 'org.hibernate.orm:hibernate-jcache', {
         exclude group:'commons-collections', module:'commons-collections'
         exclude group:'commons-logging', module:'commons-logging'
@@ -87,18 +84,18 @@ dependencies {
     }
 
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.postgresql:postgresql:42.7.5'
-    testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'com.mysql:mysql-connector-j:9.2.0'
-    testImplementation 'org.testcontainers:mysql'
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.5.2'
-    testImplementation 'org.testcontainers:mariadb'
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.7.0.25.01'
-    testImplementation 'org.testcontainers:oracle-free'
-    testImplementation 'org.testcontainers:spock'
-    testImplementation 'org.jsr107.ri:cache-ri-impl:1.1.1'
+    testImplementation 'org.postgresql:postgresql'
+    testImplementation 'org.testcontainers:testcontainers-postgresql'
+    testImplementation 'com.mysql:mysql-connector-j'
+    testImplementation 'org.testcontainers:testcontainers-mysql'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client'
+    testImplementation 'org.testcontainers:testcontainers-mariadb'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11'
+    testImplementation 'org.testcontainers:testcontainers-oracle-free'
+    testImplementation 'org.testcontainers:testcontainers-spock'
+    testImplementation 'org.jsr107.ri:cache-ri-impl'
 
-    testImplementation 'org.objenesis:objenesis:3.4' // or a more recent version if available
+    testImplementation 'org.objenesis:objenesis'
 
 
     testImplementation 'com.h2database:h2'
@@ -111,10 +108,10 @@ dependencies {
     testImplementation 'org.apache.groovy:groovy-json'
     testImplementation 'org.hibernate.orm:hibernate-jcache'
     testImplementation 'org.spockframework:spock-core'
-    testImplementation "org.hibernate.orm:hibernate-core:$hibernate7Version"
+    testImplementation "org.hibernate.orm:hibernate-core"
 
     // groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass
-    testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
+    testImplementation 'org.yakworks:hibernate-groovy-proxy', {
         exclude group: 'org.codehaus.groovy', module: 'groovy'
         exclude group: 'org.hibernate', module: 'hibernate-core'
         exclude group: 'org.hibernate.orm', module: 'hibernate-core'
@@ -126,7 +123,7 @@ dependencies {
     testRuntimeOnly 'org.slf4j:slf4j-simple'
     testRuntimeOnly 'org.slf4j:jcl-over-slf4j'
     testRuntimeOnly 'org.springframework:spring-aop'
-    testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
+    testRuntimeOnly 'org.mockito:mockito-inline'
 
 }
 
diff --git a/grails-data-hibernate7/dbmigration/build.gradle b/grails-data-hibernate7/dbmigration/build.gradle
index 2e08d24678..b934160273 100644
--- a/grails-data-hibernate7/dbmigration/build.gradle
+++ b/grails-data-hibernate7/dbmigration/build.gradle
@@ -33,29 +33,25 @@ ext {
     gormApiDocs = true
     pomTitle = 'Grails Database Migration Plugin for Hibernate 7'
     pomDescription = 'The Database Migration plugin helps you manage database changes, via Liquibase, while developing Grails applications for Hibernate 7'
-    pomDevelopers = [
-            'kazukiyamamoto': 'Kazuki YAMAMOTO',
-            'jamesfredley'  : 'James Fredley',
-    ]
 }
 
 dependencies {
     // TODO: Clarify and clean up dependencies
-    implementation platform(project(':grails-bom')) {
-        exclude group: 'org.liquibase', module: 'liquibase-core'
-    }
+    implementation platform(project(':grails-hibernate7-bom'))
 
-    implementation("org.liquibase:liquibase-core:$liquibaseHibernate7CoreVersion")
-    implementation("org.hibernate.models:hibernate-models:1.0.1")
+    implementation("org.liquibase:liquibase-core")
+    implementation("org.hibernate.models:hibernate-models")
     implementation project(':grails-data-hibernate7')
     implementation project(':grails-data-hibernate7-spring-orm')
-    compileOnly("org.hibernate.orm:hibernate-envers:$hibernate7Version")
-    testCompileOnly("org.hibernate.orm:hibernate-envers:$hibernate7Version")
+    compileOnly("org.hibernate.orm:hibernate-envers")
+    testCompileOnly("org.hibernate.orm:hibernate-envers")
 
-    compileOnly "org.projectlombok:lombok:1.18.42"
-    annotationProcessor "org.projectlombok:lombok:1.18.42"
-    testCompileOnly "org.projectlombok:lombok:1.18.42"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.42"
+    compileOnly "org.projectlombok:lombok"
+    annotationProcessor platform(project(':grails-hibernate7-bom'))
+    annotationProcessor 'org.projectlombok:lombok'
+    testCompileOnly "org.projectlombok:lombok"
+    testAnnotationProcessor platform(project(':grails-hibernate7-bom'))
+    testAnnotationProcessor "org.projectlombok:lombok"
 
     implementation(project(':grails-shell-cli')) {
         exclude group: 'org.slf4j', module: 'slf4j-simple'
@@ -87,27 +83,15 @@ dependencies {
     testImplementation project(':grails-testing-support-web')
 
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.testcontainers:spock'
+    testImplementation 'org.testcontainers:testcontainers-postgresql'
+    testImplementation 'org.testcontainers:testcontainers-spock'
     testImplementation 'com.h2database:h2'
     testImplementation 'org.hsqldb:hsqldb'
     testImplementation 'org.postgresql:postgresql'
-    testImplementation('org.liquibase:liquibase-test-harness:1.0.11') {
+    testImplementation('org.liquibase:liquibase-test-harness') {
         exclude group: 'org.liquibase', module: 'liquibase-commercial'
     }
-    testImplementation("org.hibernate.orm:hibernate-envers:$hibernate7Version")
-
-    constraints {
-        implementation("org.liquibase:liquibase-core") {
-            version {
-                strictly "$liquibaseHibernate7CoreVersion"
-            }
-        }
-        testImplementation("org.apache.derby:derby:10.16.1.1")
-        testImplementation("org.apache.derby:derbyshared:10.16.1.1")
-        testImplementation("org.apache.derby:derbytools:10.16.1.1")
-        testImplementation("org.apache.derby:derbyclient:10.16.1.1")
-    }
+    testImplementation("org.hibernate.orm:hibernate-envers")
 }
 
 tasks.named('jar', Jar) {
diff --git a/grails-data-hibernate7/docs/build.gradle b/grails-data-hibernate7/docs/build.gradle
index 25dd211e5f..a8e74fed5d 100644
--- a/grails-data-hibernate7/docs/build.gradle
+++ b/grails-data-hibernate7/docs/build.gradle
@@ -34,7 +34,7 @@ ext {
 apply plugin: 'org.apache.grails.buildsrc.groovydoc'
 
 dependencies {
-    documentation platform(project(':grails-bom'))
+    documentation platform(project(':grails-hibernate7-bom'))
     documentation 'com.github.javaparser:javaparser-core'
     documentation "info.picocli:picocli:$picocliVersion"
     documentation 'org.apache.groovy:groovy-dateutil'
@@ -46,7 +46,7 @@ dependencies {
     documentation project(':grails-bootstrap')
     documentation project(':grails-core')
     documentation project(':grails-spring')
-    documentation "org.hibernate.orm:hibernate-core:$hibernate7Version"
+    documentation "org.hibernate.orm:hibernate-core"
     coreProjects.each {
         documentation "org.apache.grails.data:$it"
     }
@@ -84,7 +84,6 @@ tasks.named('asciidoctor', AsciidoctorTask) { AsciidoctorTask it ->
 //            'migrationPluginExamplesDir': project.layout.projectDirectory.dir('src/docs/asciidoc/databaseMigration').asFile.relativePath(rootProject.findProject(':grails-data-hibernate7-dbmigration').layout.projectDirectory.asFile),
 //            'migrationPluginGroupId'    : rootProject.findProject(':grails-data-hibernate7-dbmigration').group,
 //            'migrationPluginArtifactId' : rootProject.findProject(':grails-data-hibernate7-dbmigration').name,
-//            'liquibaseHibernate7Version': liquibaseHibernate7Version
 
     ]
 }
diff --git a/grails-data-hibernate7/grails-plugin/build.gradle b/grails-data-hibernate7/grails-plugin/build.gradle
index 039809e7d8..8b18cdf00d 100644
--- a/grails-data-hibernate7/grails-plugin/build.gradle
+++ b/grails-data-hibernate7/grails-plugin/build.gradle
@@ -37,17 +37,17 @@ ext {
 
 dependencies {
     // TODO: Clarify and clean up dependencies
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
-    api "org.springframework.boot:spring-boot"
-    api "org.springframework:spring-orm"
-    api "org.hibernate.orm:hibernate-core"
-    implementation "org.hibernate.tool:hibernate-tools-orm:$hibernate7Version"
-    implementation "org.hibernate.tool:hibernate-tools-utils:$hibernate7Version"
-    api project(":grails-datastore-web")
-    api project(":grails-datamapping-support")
-    api project(":grails-data-hibernate7-spring-orm")
-    api project(":grails-data-hibernate7-core"), {
+    api 'org.springframework.boot:spring-boot'
+    api 'org.springframework:spring-orm'
+    api 'org.hibernate.orm:hibernate-core'
+    implementation 'org.hibernate.tool:hibernate-tools-orm'
+    implementation 'org.hibernate.tool:hibernate-tools-utils'
+    api project(':grails-datastore-web')
+    api project(':grails-datamapping-support')
+    api project(':grails-data-hibernate7-spring-orm')
+    api project(':grails-data-hibernate7-core'), {
         exclude group:'org.springframework', module:'spring-context'
         exclude group:'org.springframework', module:'spring-core'
         exclude group:'org.springframework', module:'spring-beans'
@@ -74,7 +74,7 @@ dependencies {
 
     testRuntimeOnly 'com.h2database:h2'
     testRuntimeOnly 'org.apache.tomcat:tomcat-jdbc'
-    testRuntimeOnly "org.hibernate.orm:hibernate-jcache", {
+    testRuntimeOnly 'org.hibernate.orm:hibernate-jcache', {
         // exclude javax variant of hibernate-core 5.6
 
     }
diff --git a/grails-data-hibernate7/spring-orm/build.gradle b/grails-data-hibernate7/spring-orm/build.gradle
index daad615d6c..a0f11ca0db 100644
--- a/grails-data-hibernate7/spring-orm/build.gradle
+++ b/grails-data-hibernate7/spring-orm/build.gradle
@@ -35,7 +35,7 @@ ext {
 }
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     api 'org.slf4j:slf4j-api'
     api 'org.springframework:spring-orm'
@@ -44,7 +44,7 @@ dependencies {
     api 'org.springframework:spring-beans'
     api 'org.springframework:spring-context'
     compileOnly 'jakarta.servlet:jakarta.servlet-api'
-    api "org.hibernate.orm:hibernate-core:${hibernate7Version}", {
+    api 'org.hibernate.orm:hibernate-core', {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.slf4j', module: 'slf4j-api'
     }
diff --git a/grails-data-mongodb/core/build.gradle b/grails-data-mongodb/core/build.gradle
index d244c24b52..6117a2d72a 100644
--- a/grails-data-mongodb/core/build.gradle
+++ b/grails-data-mongodb/core/build.gradle
@@ -132,8 +132,8 @@ dependencies {
     testImplementation project(':grails-testing-support-mongodb')
 
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.testcontainers:mongodb'
-    testImplementation 'org.testcontainers:spock'
+    testImplementation 'org.testcontainers:testcontainers-mongodb'
+    testImplementation 'org.testcontainers:testcontainers-spock'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during tests
diff --git a/grails-data-mongodb/docs/build.gradle b/grails-data-mongodb/docs/build.gradle
index afd10c47b3..a4c2f4b59b 100644
--- a/grails-data-mongodb/docs/build.gradle
+++ b/grails-data-mongodb/docs/build.gradle
@@ -63,7 +63,12 @@ dependencies {
     }
     rootProject.subprojects
             .findAll { it.findProperty('gormApiDocs') }
-            .each { documentation project(":$it.name") }
+            .each {
+                // TODO: This needs fixed for hibernate 7, but with the hibernate version conflicts, we may need to do separate documentation publishing
+                if(!it.name.startsWith('grails-data-hibernate7')) {
+                    documentation project(":$it.name")
+                }
+            }
 
     // These are added to be able to resolve the mongo version from grails-bom
     // in the resolveMongodbVersion task
diff --git a/grails-forge/grails-forge-analytics-postgres/build.gradle b/grails-forge/grails-forge-analytics-postgres/build.gradle
index be824be68b..c9afe81f4b 100644
--- a/grails-forge/grails-forge-analytics-postgres/build.gradle
+++ b/grails-forge/grails-forge-analytics-postgres/build.gradle
@@ -44,7 +44,7 @@ dependencies {
 
     testImplementation "ch.qos.logback:logback-classic:$logbackClassicVersion"
     testImplementation 'io.micronaut:micronaut-http-client'
-    testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.testcontainers:testcontainers-postgresql'
 }
 application {
     mainClass = 'org.grails.forge.analytics.postgres.Main'
diff --git a/grails-forge/grails-forge-cli/build.gradle b/grails-forge/grails-forge-cli/build.gradle
index b44a145b51..2fe5810e0f 100644
--- a/grails-forge/grails-forge-cli/build.gradle
+++ b/grails-forge/grails-forge-cli/build.gradle
@@ -97,7 +97,7 @@ dependencies {
 
     testImplementation 'io.micronaut.picocli:micronaut-picocli'
     testImplementation "org.reflections:reflections:$reflectionsVersion"
-    testImplementation 'org.testcontainers:spock'
+    testImplementation 'org.testcontainers:testcontainers-spock'
     if (project.hasProperty('micronautVersion')) {
         testCompileOnly "io.micronaut:micronaut-inject-groovy:$micronautVersion"
     }
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy
index 90801f13d1..fec83fbd4b 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy
@@ -53,6 +53,6 @@ class MongoSyncSpec extends ApplicationContextSpec implements CommandOutputFixtu
 
         then:
         template.contains('implementation "org.mongodb:mongodb-driver-sync"')
-        template.contains('testImplementation "org.testcontainers:mongodb"')
+        template.contains('testImplementation "org.testcontainers:testcontainers-mongodb"')
     }
 }
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy
index 3f52301cb8..22d30a86d5 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy
@@ -47,7 +47,7 @@ class TestContainersSpec extends ApplicationContextSpec {
                 .render()
 
         then:
-        template.contains('testImplementation "org.testcontainers:postgresql"')
+        template.contains('testImplementation "org.testcontainers:testcontainers-postgresql"')
         template.contains('testImplementation "org.testcontainers:testcontainers"')
     }
 
@@ -69,7 +69,7 @@ class TestContainersSpec extends ApplicationContextSpec {
                 .render()
 
         then:
-        template.contains('testImplementation "org.testcontainers:mongodb"')
+        template.contains('testImplementation "org.testcontainers:testcontainers-mongodb"')
         template.contains('testImplementation "org.testcontainers:testcontainers"')
     }
 
@@ -80,7 +80,7 @@ class TestContainersSpec extends ApplicationContextSpec {
                 .render()
 
         then:
-        template.contains('testImplementation "org.testcontainers:mongodb"')
+        template.contains('testImplementation "org.testcontainers:testcontainers-mongodb"')
         template.contains('testImplementation "org.testcontainers:testcontainers"')
     }
 
diff --git a/grails-test-examples/database-cleanup/build.gradle b/grails-test-examples/database-cleanup/build.gradle
index 6e05c0225a..9c5b3381ff 100644
--- a/grails-test-examples/database-cleanup/build.gradle
+++ b/grails-test-examples/database-cleanup/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     implementation 'com.h2database:h2'
     implementation 'org.apache.grails:grails-layout'
     implementation 'org.apache.grails:grails-data-hibernate5'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly "org.hibernate:hibernate-ehcache", {
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
     runtimeOnly "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
diff --git a/grails-test-examples/gorm/build.gradle b/grails-test-examples/gorm/build.gradle
index e81c1580d0..14396e56fa 100644
--- a/grails-test-examples/gorm/build.gradle
+++ b/grails-test-examples/gorm/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     }
 
     implementation 'org.apache.grails:grails-data-hibernate5'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly "org.hibernate:hibernate-ehcache", {
         // exclude javax variant of hibernate-core
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle b/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle
index 5f9c5e9f17..34f33f0cfd 100644
--- a/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle
+++ b/grails-test-examples/hibernate5/grails-hibernate-groovy-proxy/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 
     implementation 'org.apache.grails:grails-data-hibernate5'
     implementation 'org.apache.grails:grails-core'
-    implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
+    implementation 'org.yakworks:hibernate-groovy-proxy', {
         exclude group: 'org.codehaus.groovy', module: 'groovy'
     }
 
diff --git a/grails-test-examples/hibernate5/grails-hibernate/build.gradle b/grails-test-examples/hibernate5/grails-hibernate/build.gradle
index af30554144..9233fc1f52 100644
--- a/grails-test-examples/hibernate5/grails-hibernate/build.gradle
+++ b/grails-test-examples/hibernate5/grails-hibernate/build.gradle
@@ -55,7 +55,7 @@ dependencies {
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core 5.6
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/hibernate7/grails-data-service-multi-datasource/build.gradle b/grails-test-examples/hibernate7/grails-data-service-multi-datasource/build.gradle
index 6075d3facd..f9a42e1a44 100644
--- a/grails-test-examples/hibernate7/grails-data-service-multi-datasource/build.gradle
+++ b/grails-test-examples/hibernate7/grails-data-service-multi-datasource/build.gradle
@@ -27,7 +27,7 @@ version = projectVersion
 group = 'examples'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
diff --git a/grails-test-examples/hibernate7/grails-data-service/build.gradle b/grails-test-examples/hibernate7/grails-data-service/build.gradle
index 33b32dde2c..fcafe3b59e 100644
--- a/grails-test-examples/hibernate7/grails-data-service/build.gradle
+++ b/grails-test-examples/hibernate7/grails-data-service/build.gradle
@@ -28,7 +28,7 @@ version = projectVersion
 group = 'examples'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
diff --git a/grails-test-examples/hibernate7/grails-database-per-tenant/build.gradle b/grails-test-examples/hibernate7/grails-database-per-tenant/build.gradle
index e5fdcdd00c..3d1a7f848a 100644
--- a/grails-test-examples/hibernate7/grails-database-per-tenant/build.gradle
+++ b/grails-test-examples/hibernate7/grails-database-per-tenant/build.gradle
@@ -29,7 +29,7 @@ version = projectVersion
 group = 'examples'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
@@ -42,7 +42,7 @@ dependencies {
         implementation 'org.apache.grails:grails-layout'
     }
 
-    testAndDevelopmentOnly platform(project(':grails-bom'))
+    testAndDevelopmentOnly platform(project(':grails-hibernate7-bom'))
     testAndDevelopmentOnly 'org.webjars.npm:jquery'
 
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
diff --git a/grails-test-examples/hibernate7/grails-hibernate-groovy-proxy/build.gradle b/grails-test-examples/hibernate7/grails-hibernate-groovy-proxy/build.gradle
index b015ffa300..dcd8f2f783 100644
--- a/grails-test-examples/hibernate7/grails-hibernate-groovy-proxy/build.gradle
+++ b/grails-test-examples/hibernate7/grails-hibernate-groovy-proxy/build.gradle
@@ -27,11 +27,11 @@ version = projectVersion
 group = 'examples'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
-    implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
+    implementation 'org.yakworks:hibernate-groovy-proxy', {
         exclude group: 'org.codehaus.groovy', module: 'groovy'
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/hibernate7/grails-hibernate/build.gradle b/grails-test-examples/hibernate7/grails-hibernate/build.gradle
index 05d502aa33..a8920312f6 100644
--- a/grails-test-examples/hibernate7/grails-hibernate/build.gradle
+++ b/grails-test-examples/hibernate7/grails-hibernate/build.gradle
@@ -29,7 +29,7 @@ version = projectVersion
 group = 'examples'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'jakarta.persistence:jakarta.persistence-api'
@@ -44,7 +44,7 @@ dependencies {
         implementation 'org.apache.grails:grails-layout'
     }
 
-    testAndDevelopmentOnly platform(project(':grails-bom'))
+    testAndDevelopmentOnly platform(project(':grails-hibernate7-bom'))
     testAndDevelopmentOnly 'org.webjars.npm:jquery'
 
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
@@ -54,10 +54,7 @@ dependencies {
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
-        // exclude javax variant of hibernate-core 5.6
-        exclude group: 'org.hibernate', module: 'hibernate-core'
-    }
+    // TODO: hibernate-ehcache was icnluded here but historically was replaced by hibernate-jcache
     runtimeOnly "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
         // required for hibernate-ehcache to work with javax variant of hibernate-core excluded
     }
diff --git a/grails-test-examples/hibernate7/grails-multiple-datasources/build.gradle b/grails-test-examples/hibernate7/grails-multiple-datasources/build.gradle
index bcfa662a2c..934a092aad 100644
--- a/grails-test-examples/hibernate7/grails-multiple-datasources/build.gradle
+++ b/grails-test-examples/hibernate7/grails-multiple-datasources/build.gradle
@@ -31,7 +31,7 @@ configurations {
 }
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     astTransformation 'jakarta.servlet:jakarta.servlet-api'
     astTransformation 'org.apache.grails:grails-controllers'
diff --git a/grails-test-examples/hibernate7/grails-multitenant-multi-datasource/build.gradle b/grails-test-examples/hibernate7/grails-multitenant-multi-datasource/build.gradle
index 6075d3facd..f9a42e1a44 100644
--- a/grails-test-examples/hibernate7/grails-multitenant-multi-datasource/build.gradle
+++ b/grails-test-examples/hibernate7/grails-multitenant-multi-datasource/build.gradle
@@ -27,7 +27,7 @@ version = projectVersion
 group = 'examples'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
diff --git a/grails-test-examples/hibernate7/grails-partitioned-multi-tenancy/build.gradle b/grails-test-examples/hibernate7/grails-partitioned-multi-tenancy/build.gradle
index 4157df2332..a5b264fd20 100644
--- a/grails-test-examples/hibernate7/grails-partitioned-multi-tenancy/build.gradle
+++ b/grails-test-examples/hibernate7/grails-partitioned-multi-tenancy/build.gradle
@@ -29,7 +29,7 @@ version = projectVersion
 group = 'examples'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
@@ -42,7 +42,7 @@ dependencies {
         implementation 'org.apache.grails:grails-layout'
     }
 
-    testAndDevelopmentOnly platform(project(':grails-bom'))
+    testAndDevelopmentOnly platform(project(':grails-hibernate7-bom'))
     testAndDevelopmentOnly 'org.webjars.npm:jquery'
 
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
diff --git a/grails-test-examples/hibernate7/grails-schema-per-tenant/build.gradle b/grails-test-examples/hibernate7/grails-schema-per-tenant/build.gradle
index 8469c41516..10c29b3e17 100644
--- a/grails-test-examples/hibernate7/grails-schema-per-tenant/build.gradle
+++ b/grails-test-examples/hibernate7/grails-schema-per-tenant/build.gradle
@@ -29,7 +29,7 @@ version = projectVersion
 group = 'schemapertenant'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
@@ -42,7 +42,7 @@ dependencies {
         implementation 'org.apache.grails:grails-layout'
     }
 
-    testAndDevelopmentOnly platform(project(':grails-bom'))
+    testAndDevelopmentOnly platform(project(':grails-hibernate7-bom'))
     testAndDevelopmentOnly 'org.webjars.npm:jquery'
 
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
diff --git a/grails-test-examples/hibernate7/issue450/build.gradle b/grails-test-examples/hibernate7/issue450/build.gradle
index b371ae983d..7cbdcec180 100644
--- a/grails-test-examples/hibernate7/issue450/build.gradle
+++ b/grails-test-examples/hibernate7/issue450/build.gradle
@@ -29,7 +29,7 @@ version = projectVersion
 group = 'multitenantcomposite'
 
 dependencies {
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7'
     implementation 'org.apache.grails:grails-core'
@@ -42,7 +42,7 @@ dependencies {
         implementation 'org.apache.grails:grails-layout'
     }
 
-    testAndDevelopmentOnly platform(project(':grails-bom'))
+    testAndDevelopmentOnly platform(project(':grails-hibernate7-bom'))
     testAndDevelopmentOnly 'org.webjars.npm:bootstrap'
     testAndDevelopmentOnly 'org.webjars.npm:jquery'
 
diff --git a/grails-test-examples/hibernate7/spring-boot-hibernate/build.gradle b/grails-test-examples/hibernate7/spring-boot-hibernate/build.gradle
index d91972aaec..f39010f0de 100644
--- a/grails-test-examples/hibernate7/spring-boot-hibernate/build.gradle
+++ b/grails-test-examples/hibernate7/spring-boot-hibernate/build.gradle
@@ -29,7 +29,7 @@ group = 'examples'
 
 dependencies {
 
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
 
     implementation 'org.apache.grails:grails-data-hibernate7-spring-boot'
     implementation 'org.springframework.boot:spring-boot-starter-web'
diff --git a/grails-test-examples/hibernate7/standalone-hibernate/build.gradle b/grails-test-examples/hibernate7/standalone-hibernate/build.gradle
index 6e34fa0aad..81b1e46ffb 100644
--- a/grails-test-examples/hibernate7/standalone-hibernate/build.gradle
+++ b/grails-test-examples/hibernate7/standalone-hibernate/build.gradle
@@ -28,7 +28,7 @@ group = 'examples'
 
 dependencies {
 
-    implementation platform(project(':grails-bom'))
+    implementation platform(project(':grails-hibernate7-bom'))
     implementation 'org.apache.grails.data:grails-data-hibernate7-core'
     implementation 'org.apache.grails.data:grails-data-hibernate7-spring-orm'
     implementation 'org.springframework:spring-tx'
diff --git a/grails-test-examples/hyphenated/build.gradle b/grails-test-examples/hyphenated/build.gradle
index 27e62a9648..87589bf3c3 100644
--- a/grails-test-examples/hyphenated/build.gradle
+++ b/grails-test-examples/hyphenated/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     testAndDevelopmentOnly platform(project(':grails-bom'))
     testAndDevelopmentOnly 'org.webjars.npm:jquery'
 
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-test-examples/mongodb/hibernate5/build.gradle b/grails-test-examples/mongodb/hibernate5/build.gradle
index 12d7832f07..b6c543c4ea 100644
--- a/grails-test-examples/mongodb/hibernate5/build.gradle
+++ b/grails-test-examples/mongodb/hibernate5/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     runtimeOnly 'org.fusesource.jansi:jansi'
     runtimeOnly 'org.apache.grails:grails-scaffolding'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
-    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
+    runtimeOnly 'org.hibernate:hibernate-ehcache', {
         // exclude javax variant of hibernate-core
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
diff --git a/grails-testing-support-dbcleanup-core/README.md b/grails-testing-support-dbcleanup-core/README.md
index 5ed80a37cb..6151d059df 100644
--- a/grails-testing-support-dbcleanup-core/README.md
+++ b/grails-testing-support-dbcleanup-core/README.md
@@ -106,8 +106,8 @@ jdbc:h2:file:/tmp/testdb
 **Libraries**:
 - `org.apache.groovy:groovy-sql` - SQL DSL for Groovy
 - `org.postgresql:postgresql` - PostgreSQL JDBC Driver
-- `org.testcontainers:postgresql:1.20.1` (test scope)
-- `org.testcontainers:testcontainers:1.20.1` (test scope)
+- `org.testcontainers:testcontainers-postgresql` (test scope)
+- `org.testcontainers:testcontainers` (test scope)
 
 **Features**:
 - Automatic table truncation for PostgreSQL-backed tests
diff --git a/grails-testing-support-dbcleanup-postgresql/README.md b/grails-testing-support-dbcleanup-postgresql/README.md
index fdeec12b64..c97f6d4737 100644
--- a/grails-testing-support-dbcleanup-postgresql/README.md
+++ b/grails-testing-support-dbcleanup-postgresql/README.md
@@ -27,6 +27,6 @@ To use PostgreSQL database cleanup in your integration tests, add the following
 testImplementation 'org.postgresql:postgresql'
 
 // Optional: For functional tests with Docker containers
-testImplementation 'org.testcontainers:postgresql:1.20.1'
-testImplementation 'org.testcontainers:testcontainers:1.20.1'
+testImplementation 'org.testcontainers:testcontainers-postgresql'
+testImplementation 'org.testcontainers:testcontainers'
 ```
diff --git a/grails-testing-support-dbcleanup-postgresql/build.gradle b/grails-testing-support-dbcleanup-postgresql/build.gradle
index 3644ad1461..0599fa8154 100644
--- a/grails-testing-support-dbcleanup-postgresql/build.gradle
+++ b/grails-testing-support-dbcleanup-postgresql/build.gradle
@@ -49,8 +49,8 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy'
     testImplementation 'org.postgresql:postgresql'
-    testImplementation 'org.testcontainers:postgresql:1.20.1'
-    testImplementation 'org.testcontainers:testcontainers:1.20.1'
+    testImplementation 'org.testcontainers:testcontainers-postgresql'
+    testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.slf4j:slf4j-simple'
     testRuntimeOnly 'net.bytebuddy:byte-buddy'
 }
diff --git a/settings.gradle b/settings.gradle
index 78701cdfff..0588ee3b94 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -108,6 +108,7 @@ include(
         'grails-dependencies-starter-web',
         'grails-dependencies-test',
         'grails-dependencies-assets',
+        'grails-base-bom',
         'grails-bom',
         'grails-hibernate5-bom',
         'grails-hibernate7-bom',
@@ -188,6 +189,11 @@ include(
         'grails-micronaut',
 )
 
+project(':grails-bom').projectDir = file('grails-bom/default')
+project(':grails-base-bom').projectDir = file('grails-bom/base')
+project(':grails-hibernate5-bom').projectDir = file('grails-bom/hibernate5')
+project(':grails-hibernate7-bom').projectDir = file('grails-bom/hibernate7')
+
 // Instead of using : to separate nested projects, fix the project directories by setting the projectDir explicitly
 // (Preserve the parent directory name as part of the nested project name)
 project(':grails-events-core').projectDir = file('grails-events/core')


(grails-core) 02/04: fix broken dbmigration tests

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit 8bc5d30e965333347248ff4866090a641df8a723
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Fri Apr 10 11:32:46 2026 -0500

    fix broken dbmigration tests
---
 .../integration-test/resources/logback-test.xml    | 36 ++++++++++++++++++++++
 .../DbmGenerateGormChangelogCommandSpec.groovy     |  8 ++---
 .../command/DbmGormDiffCommandSpec.groovy          |  8 ++---
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/grails-data-hibernate7/dbmigration/src/integration-test/resources/logback-test.xml b/grails-data-hibernate7/dbmigration/src/integration-test/resources/logback-test.xml
index e69de29bb2..1576e5585e 100644
--- a/grails-data-hibernate7/dbmigration/src/integration-test/resources/logback-test.xml
+++ b/grails-data-hibernate7/dbmigration/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+     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
+
+       http://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.
+
+-->
+<configuration>
+
+    <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>
+        </encoder>
+    </appender>
+
+    <root level="ERROR"><appender-ref ref="STDOUT"/></root>
+
+</configuration>
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy
index e7a075146d..34124ea6eb 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGenerateGormChangelogCommandSpec.groovy
@@ -62,11 +62,11 @@ databaseChangeLog = \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "author_id", type: "BIGINT"\\) \\{
+            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
+            column\\(name: "author_id", type: "BIGINT"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
         \\}
@@ -117,11 +117,11 @@ databaseChangeLog = \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "author_id", type: "BIGINT"\\) \\{
+            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
+            column\\(name: "author_id", type: "BIGINT"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
         \\}
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy
index 841996094a..c5354bbc2f 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/org/grails/plugins/databasemigration/command/DbmGormDiffCommandSpec.groovy
@@ -50,11 +50,11 @@ databaseChangeLog = \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "author_id", type: "BIGINT"\\) \\{
+            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
+            column\\(name: "author_id", type: "BIGINT"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
         \\}
@@ -89,11 +89,11 @@ databaseChangeLog = \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "author_id", type: "BIGINT"\\) \\{
+            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
 
-            column\\(name: "title", type: "VARCHAR\\(255\\)"\\) \\{
+            column\\(name: "author_id", type: "BIGINT"\\) \\{
                 constraints\\(nullable: "false"\\)
             \\}
         \\}


(grails-core) 04/04: Update check-qual to match micronaut version

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit ec1219804f5bb335263fa01d444ca3c863a981f6
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri Apr 10 14:01:04 2026 -0400

    Update check-qual to match micronaut version
---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index a317053ef1..8d78c3572e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -71,7 +71,7 @@ ext {
             'asset-pipeline-bom.version'    : '5.1.0-M4',
             'bootstrap-icons.version'       : '1.13.1',
             'bootstrap.version'             : '5.3.8',
-            'checker-qual.version'          : '3.48.4',
+            'checker-qual.version'          : '3.51.1',
             'commons-codec.version'         : '1.19.0',
             'commons-lang3.version'         : '3.20.0',
             'geb-spock.version'             : '8.0.1',