Merge pull request #915 from codeconsole/9.0.x-rename-version

Rename hibernate5Version -> hibernateVersion
grails · Oct 31, 2024 · 7c001b1 · 7c001b1
2 parents 858c0ca + 9c11a2a
commit 7c001b1
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"), {