Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion examples/grails-data-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation "org.grails.plugins:cache"
implementation "org.grails.plugins:events"
implementation project(":grails-plugin")
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
implementation "org.grails.plugins:views-json"
implementation "org.grails.plugins:views-json-templates"
implementation "org.grails.plugins:spring-security-rest:$grailsSpringSecurityRestVersion"
Expand Down
2 changes: 1 addition & 1 deletion examples/grails-hibernate-groovy-proxy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation "org.grails:grails-web-boot:$grailsVersion"
implementation project(":grails-plugin")

implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"

runtimeOnly "com.h2database:h2"
runtimeOnly "org.yaml:snakeyaml:$snakeYamlVersion"
Expand Down
2 changes: 1 addition & 1 deletion examples/grails3-database-per-tenant/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
implementation project(":grails-plugin")


implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "com.h2database:h2"
Expand Down
4 changes: 2 additions & 2 deletions examples/grails3-hibernate5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dependencies {
implementation "org.grails:grails-web-boot:$grailsVersion"
implementation project(":grails-plugin")

implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
implementation "org.hibernate:hibernate-ehcache:$hibernateVersion"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "com.h2database:h2"
Expand Down
2 changes: 1 addition & 1 deletion examples/grails3-multiple-datasources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
implementation "org.grails:grails-web-boot:$grailsVersion"
implementation project(":grails-plugin")

implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "com.h2database:h2"
Expand Down
2 changes: 1 addition & 1 deletion examples/grails3-partitioned-multi-tenancy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
implementation "org.grails:grails-web-boot:$grailsVersion"
implementation project(":grails-plugin")

implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "com.h2database:h2"
Expand Down
2 changes: 1 addition & 1 deletion examples/grails3-schema-per-tenant/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
implementation "org.grails:grails-web-boot:$grailsVersion"
implementation project(":grails-plugin")

implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"

runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
runtimeOnly "com.h2database:h2"
Expand Down
4 changes: 2 additions & 2 deletions examples/spring-boot-hibernate5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ dependencies {
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation project(":gorm-hibernate5-spring-boot")
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
implementation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
implementation "org.hibernate:hibernate-ehcache:$hibernateVersion"

runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ grailsSpringSecurityRestVersion=6.0.0-SNAPSHOT
grailsVersion=7.0.0-SNAPSHOT
groovydocGradlePluginVersion=1.0.1
groovyVersion=4.0.24-SNAPSHOT
hibernate5Version=5.6.15.Final
hibernateVersion=5.6.15.Final
hibernateValidatorVersion=8.0.1.Final
hibernateGroovyProxy=1.1
jakartaAnnotationApiVersion=3.0.0
Expand Down
8 changes: 4 additions & 4 deletions grails-datastore-gorm-hibernate5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api "org.apache.groovy:groovy:$groovyVersion"
api("org.grails:grails-datastore-gorm:$gormVersion")
api "org.springframework:spring-orm:$springVersion"
api("org.hibernate:hibernate-core-jakarta:$hibernate5Version") {
api("org.hibernate:hibernate-core-jakarta:$hibernateVersion") {
exclude group:'commons-logging', module:'commons-logging'
exclude group:'com.h2database', module:'h2'
exclude group:'commons-collections', module:'commons-collections'
Expand All @@ -19,7 +19,7 @@ dependencies {
exclude group:'org.slf4j', module:'slf4j-api'
}

compileOnly ("org.hibernate:hibernate-ehcache:$hibernate5Version") {
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'
Expand All @@ -40,7 +40,7 @@ dependencies {
}
testImplementation "com.h2database:h2"

testImplementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
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:$hibernateGroovyProxy"
Expand All @@ -52,7 +52,7 @@ dependencies {
testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"
testRuntimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion"
// The groovydoc task needs the Hibernate 4.x jars in the classpath
documentation("org.hibernate:hibernate-core-jakarta:${hibernate5Version}")
documentation("org.hibernate:hibernate-core-jakarta:${hibernateVersion}")
}

test {
Expand Down
4 changes: 2 additions & 2 deletions grails-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ dependencies {

api "org.springframework.boot:spring-boot:$springBootVersion"
api "org.springframework:spring-orm:$springVersion"
api "org.hibernate:hibernate-core-jakarta:${hibernate5Version}"
api "org.hibernate:hibernate-ehcache:$hibernate5Version"
api "org.hibernate:hibernate-core-jakarta:${hibernateVersion}"
api "org.hibernate:hibernate-ehcache:$hibernateVersion"
api "org.grails:grails-datastore-web:$gormVersion"
api "org.grails:grails-datastore-gorm-support:$gormVersion"
api project(":grails-datastore-gorm-hibernate5"), {
Expand Down
Loading