Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Exclude hibernate-ehcache #955

Merged
merged 8 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ To use GORM {pluginVersion} for Hibernate in Grails 3 you can specify the follow
----
dependencies {
compile "org.grails.plugins:hibernate5:{pluginVersion}"
compile "org.hibernate:hibernate-ehcache"
compile "org.hibernate:hibernate-ehcache", {
exclude group:'org.hibernate', module:'hibernate-core'
}
}
----

Expand Down
4 changes: 3 additions & 1 deletion docs/src/docs/asciidoc/gettingStarted/springBoot.adoc
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 gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ grailsGradlePluginVersion=7.0.0-M2
grailsVersion=7.0.0-M1
groovyVersion=4.0.24
hibernateVersion=5.6.15.Final
jbossTransactionApiVersion=2.0.0.Final
yakworksHibernateGroovyProxyVersion=1.1
micronautPlatformVersion=4.6.3
picocliVersion=4.7.6
Expand Down
4 changes: 3 additions & 1 deletion grails-datastore-gorm-hibernate/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ dependencies {
}
testImplementation "com.h2database:h2"

testImplementation "org.hibernate:hibernate-ehcache:$hibernateVersion"
testImplementation "org.hibernate:hibernate-ehcache:$hibernateVersion", {
exclude group:'org.hibernate', module:'hibernate-core'
}

// groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass
testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
Expand Down
9 changes: 8 additions & 1 deletion grails-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ 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.hibernate:hibernate-ehcache:$hibernateVersion", {
exclude group:'org.hibernate', module:'hibernate-core'
}
// required for org.hibernate:hibernate-ehcache to work with org.hibernate:hibernate-core-jakarta
api "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
exclude group:"jakarta.enterprise", module:"jakarta.enterprise.cdi-api"
}

api "org.grails:grails-datastore-web"
api "org.grails:grails-datastore-gorm-support"
api project(":grails-datastore-gorm-hibernate5"), {
Expand Down
Loading