Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exclude hibernate-ehcache #955

Merged
merged 8 commits into from
Feb 20, 2025
+51 −65
Merged

Exclude hibernate-ehcache #955

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b1cc84
exclude hibernate-core dependency
jamesfredley Feb 4, 2025
2ddbfff
add jboss-transaction-api dependency
jamesfredley Feb 4, 2025
89ccb91
remove doc change from Grails 3
jamesfredley Feb 4, 2025
85bf404
build: remove module dependency on `hibernate-ehcache`
matrei Feb 5, 2025
b00713a
build: explicitly exclude `hibernate-core` from `hibernate-ehcache`
matrei Feb 7, 2025
285efe8
build: add `jboss-transaction-api` for `hibernate-ehcache`
matrei Feb 8, 2025
56964cf
docs: update GORM in Spring Boot section
matrei Feb 8, 2025
eecb602
build: fix wrong dependency configuration
matrei Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/src/docs/asciidoc/gettingStarted/springBoot.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ To use GORM for Hibernate in Spring Boot add the necessary dependencies to your
----
compile("org.grails:gorm-hibernate5-spring-boot:{version}")
compile "org.hibernate:hibernate-core-jakarta"
compile "org.hibernate:hibernate-ehcache"
compile "org.hibernate:hibernate-ehcache", {
exclude group:'org.hibernate', module:'hibernate-core'
}
runtime "com.h2database:h2:1.4.192"
// for MySQL
// runtime "mysql:mysql-connector-java"
Expand Down
1 change: 1 addition & 0 deletions examples/grails-hibernate/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies {
runtimeOnly 'org.grails:grails-plugin-services'
runtimeOnly 'org.grails:grails-plugin-url-mappings'
runtimeOnly 'org.grails.plugins:fields'
runtimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the following to document the right approach and avoid conflicts from the javax version?

, {
    exclude group:'org.hibernate', module:'hibernate-core'
}

runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
Expand Down
20 changes: 2 additions & 18 deletions grails-datastore-gorm-hibernate/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,6 @@ dependencies {
exclude group:'org.slf4j', module:'slf4j-api'
}

compileOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", {
exclude group:'commons-collections', module:'commons-collections'
exclude group:'commons-logging', module:'commons-logging'
exclude group:'com.h2database', module:'h2'
exclude group:'net.sf.ehcache', module:'ehcache'
exclude group:'net.sf.ehcache', module:'ehcache-core'
exclude group:'org.hibernate', module:'hibernate-core'
exclude group:'org.slf4j', module:'jcl-over-slf4j'
exclude group:'org.slf4j', module:'slf4j-api'
exclude group:'org.slf4j', module:'slf4j-log4j12'
exclude group:'xml-apis', module:'xml-apis'
}

testImplementation "org.apache.groovy:groovy-test-junit5"
testImplementation "org.apache.groovy:groovy-sql"
testImplementation "org.apache.groovy:groovy-json"
Expand All @@ -42,20 +29,17 @@ dependencies {
}
testImplementation "com.h2database:h2"

testImplementation "org.hibernate:hibernate-ehcache:$hibernateVersion"

// groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass
testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
exclude group: "org.codehaus.groovy", module: "groovy"
}

testImplementation "org.apache.tomcat:tomcat-jdbc"
testRuntimeOnly "org.springframework:spring-aop"

testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the following to document the right approach and avoid conflicts from the javax version?

, {
    exclude group:'org.hibernate', module:'hibernate-core'
}

testRuntimeOnly "org.slf4j:slf4j-simple"
testRuntimeOnly "org.slf4j:jcl-over-slf4j"
// The groovydoc task needs the Hibernate 4.x jars in the classpath
documentation "org.hibernate:hibernate-core-jakarta:${hibernateVersion}"
testRuntimeOnly "org.springframework:spring-aop"
}

test {
Expand Down
6 changes: 4 additions & 2 deletions grails-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ dependencies {
api "org.springframework.boot:spring-boot"
api "org.springframework:spring-orm"
api "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
api "org.hibernate:hibernate-ehcache:$hibernateVersion"
api "org.grails:grails-datastore-web"
api "org.grails:grails-datastore-gorm-support"
api project(":grails-datastore-gorm-hibernate5"), {
Expand All @@ -38,12 +37,15 @@ dependencies {
exclude group:'org.grails', module:'grails-core'
exclude group:'javax.transaction', module:'jta'
}
testRuntimeOnly "org.yaml:snakeyaml"

testImplementation "org.grails:grails-gorm-testing-support"

testRuntimeOnly "com.h2database:h2"
testRuntimeOnly "org.apache.tomcat:tomcat-jdbc"
testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the following to document the right approach and avoid conflicts from the javax version?

, {
    exclude group:'org.hibernate', module:'hibernate-core'
}

testRuntimeOnly "org.springframework:spring-aop"
testRuntimeOnly "org.springframework:spring-expression"
testRuntimeOnly "org.yaml:snakeyaml"
}

groovydoc.classpath += configurations.documentation
Loading