From 9c11a2acaec7f5b89cfd36dad611386f20294e52 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Thu, 31 Oct 2024 15:09:27 -0700 Subject: [PATCH] Rename hibernate5Version -> hibernateVersion --- examples/grails-data-service/build.gradle | 2 +- examples/grails-hibernate-groovy-proxy/build.gradle | 2 +- examples/grails3-database-per-tenant/build.gradle | 2 +- examples/grails3-hibernate5/build.gradle | 4 ++-- examples/grails3-multiple-datasources/build.gradle | 2 +- examples/grails3-partitioned-multi-tenancy/build.gradle | 2 +- examples/grails3-schema-per-tenant/build.gradle | 2 +- examples/spring-boot-hibernate5/build.gradle | 4 ++-- gradle.properties | 2 +- grails-datastore-gorm-hibernate5/build.gradle | 8 ++++---- grails-plugin/build.gradle | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/grails-data-service/build.gradle b/examples/grails-data-service/build.gradle index 9efe05f1..6b793a73 100644 --- a/examples/grails-data-service/build.gradle +++ b/examples/grails-data-service/build.gradle @@ -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" diff --git a/examples/grails-hibernate-groovy-proxy/build.gradle b/examples/grails-hibernate-groovy-proxy/build.gradle index dff3d5a9..63f9a4b7 100644 --- a/examples/grails-hibernate-groovy-proxy/build.gradle +++ b/examples/grails-hibernate-groovy-proxy/build.gradle @@ -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" diff --git a/examples/grails3-database-per-tenant/build.gradle b/examples/grails3-database-per-tenant/build.gradle index 19aae7b0..cab969cb 100644 --- a/examples/grails3-database-per-tenant/build.gradle +++ b/examples/grails3-database-per-tenant/build.gradle @@ -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" diff --git a/examples/grails3-hibernate5/build.gradle b/examples/grails3-hibernate5/build.gradle index ba0862d7..bcf46bfe 100644 --- a/examples/grails3-hibernate5/build.gradle +++ b/examples/grails3-hibernate5/build.gradle @@ -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" diff --git a/examples/grails3-multiple-datasources/build.gradle b/examples/grails3-multiple-datasources/build.gradle index ee7ee4ef..302e7cee 100644 --- a/examples/grails3-multiple-datasources/build.gradle +++ b/examples/grails3-multiple-datasources/build.gradle @@ -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" diff --git a/examples/grails3-partitioned-multi-tenancy/build.gradle b/examples/grails3-partitioned-multi-tenancy/build.gradle index ab7ed611..31da54b6 100644 --- a/examples/grails3-partitioned-multi-tenancy/build.gradle +++ b/examples/grails3-partitioned-multi-tenancy/build.gradle @@ -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" diff --git a/examples/grails3-schema-per-tenant/build.gradle b/examples/grails3-schema-per-tenant/build.gradle index 395b37da..97910ad2 100644 --- a/examples/grails3-schema-per-tenant/build.gradle +++ b/examples/grails3-schema-per-tenant/build.gradle @@ -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" diff --git a/examples/spring-boot-hibernate5/build.gradle b/examples/spring-boot-hibernate5/build.gradle index 22de4c9c..e19225c4 100644 --- a/examples/spring-boot-hibernate5/build.gradle +++ b/examples/spring-boot-hibernate5/build.gradle @@ -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" diff --git a/gradle.properties b/gradle.properties index d9131077..4a1eda31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/grails-datastore-gorm-hibernate5/build.gradle b/grails-datastore-gorm-hibernate5/build.gradle index a36a29c6..62334dfc 100644 --- a/grails-datastore-gorm-hibernate5/build.gradle +++ b/grails-datastore-gorm-hibernate5/build.gradle @@ -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' @@ -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' @@ -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" @@ -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 { diff --git a/grails-plugin/build.gradle b/grails-plugin/build.gradle index 8aa378ca..3f391476 100644 --- a/grails-plugin/build.gradle +++ b/grails-plugin/build.gradle @@ -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"), {