This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a commit to branch fix/8.0.x-merge-sb4-fallout
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/fix/8.0.x-merge-sb4-fallout by
this push:
new 8275577532 Address review feedback: remove unnecessary inline comments
8275577532 is described below
commit 8275577532ac431a4a924238c4a3b66261931ee5
Author: James Fredley <[email protected]>
AuthorDate: Fri May 22 09:24:51 2026 -0400
Address review feedback: remove unnecessary inline comments
Per review on PR #15673, drop the explanatory comments the reviewer flagged
as unnecessary or self-evident from the diff:
- grails-data-hibernate5/dbmigration/build.gradle: drop the extended
rationale block above jul-to-slf4j; the slf4j-simple binding is already
gone and the short note is enough.
- grails-test-examples/graphql/grails-multi-datastore-app/build.gradle:
drop the testcontainer-host comment above grails-testing-support-mongodb.
-
grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/
groovy/myapp/BarIntegrationSpec.groovy: drop the GORM datastore-property
explanation; the GormEnhancer.findStaticApi call is self-describing.
-
grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/
groovy/myapp/FooIntegrationSpec.groovy: same as Bar.
- grails-test-examples/graphql/spring-boot-app/build.gradle: drop the
Spring Boot 4 HibernateJpaAutoConfiguration / GORM auto-config commentary
above the spring-boot-hibernate and grails-data-hibernate5-spring-boot
dependencies.
Assisted-by: claude-code:claude-4.7-opus
---
grails-data-hibernate5/dbmigration/build.gradle | 6 +-----
.../graphql/grails-multi-datastore-app/build.gradle | 3 ---
.../src/integration-test/groovy/myapp/BarIntegrationSpec.groovy | 2 --
.../src/integration-test/groovy/myapp/FooIntegrationSpec.groovy | 2 --
grails-test-examples/graphql/spring-boot-app/build.gradle | 7 -------
5 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/grails-data-hibernate5/dbmigration/build.gradle
b/grails-data-hibernate5/dbmigration/build.gradle
index 41cac23017..3a74dd0429 100644
--- a/grails-data-hibernate5/dbmigration/build.gradle
+++ b/grails-data-hibernate5/dbmigration/build.gradle
@@ -75,11 +75,7 @@ dependencies {
testImplementation project(':grails-testing-support-web')
testImplementation 'com.h2database:h2'
- // Liquibase uses JUL for logging -> redirect it to SLF4J to reliably
capture its output.
- // Spring Boot's starter (transitively via spring-boot-starter-tomcat)
already supplies
- // Logback as the SLF4J binding; adding slf4j-simple here would cause two
competing
- // bindings and Spring Boot's LogbackLoggingSystem aborts context startup
when that
- // happens. See https://www.slf4j.org/codes.html#multiple_bindings
+ // Liquibase uses JUL for logging -> redirect it to SLF4J to reliably
capture its output
testRuntimeOnly 'org.slf4j:jul-to-slf4j'
}
diff --git
a/grails-test-examples/graphql/grails-multi-datastore-app/build.gradle
b/grails-test-examples/graphql/grails-multi-datastore-app/build.gradle
index 409094b452..74d697bc1d 100644
--- a/grails-test-examples/graphql/grails-multi-datastore-app/build.gradle
+++ b/grails-test-examples/graphql/grails-multi-datastore-app/build.gradle
@@ -70,9 +70,6 @@ dependencies {
testImplementation 'org.apache.grails:grails-testing-support-datamapping'
testImplementation 'org.apache.grails:grails-testing-support-web'
-
- // Auto-start a MongoDB testcontainer before integration tests (overrides
the
- // localhost:27017 host in application.yml via grails.mongodb.host system
property).
testImplementation
'org.apache.grails.testing:grails-testing-support-mongodb'
}
diff --git
a/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/BarIntegrationSpec.groovy
b/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/BarIntegrationSpec.groovy
index 9e91ed3569..1c1bd3baa9 100644
---
a/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/BarIntegrationSpec.groovy
+++
b/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/BarIntegrationSpec.groovy
@@ -46,8 +46,6 @@ class BarIntegrationSpec extends Specification implements
GraphQLSpec {
then: 'bar is created in the Mongo datastore with a valid ObjectId'
new ObjectId((String) obj.id)
- // GORM no longer surfaces `datastore` as a property on the Mongo
session;
- // reach it through GormEnhancer's static API instead.
GormEnhancer.findStaticApi(Bar).datastore instanceof MongoDatastore
}
}
diff --git
a/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/FooIntegrationSpec.groovy
b/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/FooIntegrationSpec.groovy
index 05ee9c0dee..10a2644be2 100644
---
a/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/FooIntegrationSpec.groovy
+++
b/grails-test-examples/graphql/grails-multi-datastore-app/src/integration-test/groovy/myapp/FooIntegrationSpec.groovy
@@ -45,8 +45,6 @@ class FooIntegrationSpec extends Specification implements
GraphQLSpec {
then: 'foo is created in the Hibernate datastore'
obj.id == 1
- // GORM no longer surfaces `datastore` as a property on the Hibernate
- // SessionImpl; reach it through GormEnhancer's static API instead.
GormEnhancer.findStaticApi(Foo).datastore instanceof HibernateDatastore
}
}
diff --git a/grails-test-examples/graphql/spring-boot-app/build.gradle
b/grails-test-examples/graphql/spring-boot-app/build.gradle
index 3c983c6aac..0dc9e9eb53 100644
--- a/grails-test-examples/graphql/spring-boot-app/build.gradle
+++ b/grails-test-examples/graphql/spring-boot-app/build.gradle
@@ -37,15 +37,8 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-web'
- // Spring Boot 4 moved HibernateJpaAutoConfiguration to the
spring-boot-hibernate module.
- // It must be on the runtime classpath: GORM's
HibernateGormAutoConfiguration
- // declares @AutoConfigureBefore([HibernateJpaAutoConfiguration]), and
DemoApplication
- // references the class in @EnableAutoConfiguration(exclude = ...). Spring
Boot's actual
- // JPA auto-configuration is then suppressed by that exclusion so GORM
owns Hibernate.
implementation 'org.springframework.boot:spring-boot-hibernate'
- // GORM + Hibernate 5 (Jakarta variant), configured via GORM's Spring Boot
auto-config
- // (registers HibernateDatastore, dataSource, transactionManager as Spring
beans).
implementation 'org.apache.grails:grails-data-hibernate5-spring-boot'
implementation 'org.apache.grails.data:grails-data-hibernate5-core'
implementation 'org.apache.grails.data:grails-datamapping-core'
