Merge pull request #1859 from grails/use-more-grails-bom-version

use more versions from grails-bom
grails · Jan 11, 2025 · 8f342f5 · 8f342f5
2 parents e4a4dc8 + 75d8d7f
commit 8f342f5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -118,7 +118,7 @@ subprojects {
 
     dependencies {
         api platform("org.grails:grails-bom:$grailsVersion")
-        api "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion"
+        api "jakarta.annotation:jakarta.annotation-api"
         implementation "jakarta.validation:jakarta.validation-api"
         compileOnly "com.github.spotbugs:spotbugs-annotations"
 

diff --git a/gradle.properties b/gradle.properties
@@ -14,9 +14,7 @@ gradleNexusPluginVersion=2.3.1
 gradleNexusPublishPluginVersion=1.3.0
 grailsVersion=7.0.0-M1
 groovyVersion=4.0.24
-hibernateValidatorVersion=7.0.5.Final
 javassistVersion=3.30.2-GA
-jakartaAnnotationApiVersion=3.0.0
 picocliVersion=4.7.6
 rxjavaVersion=1.3.8
 

diff --git a/grails-datastore-gorm-rx/build.gradle b/grails-datastore-gorm-rx/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     }
     api project(":grails-datastore-core")
     implementation "org.javassist:javassist:$javassistVersion"
-    compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
+    compileOnly("org.hibernate.validator:hibernate-validator")
     documentation "org.springframework:spring-beans"
     documentation "org.grails:grails-async"
 }
diff --git a/grails-datastore-gorm-validation/build.gradle b/grails-datastore-gorm-validation/build.gradle
@@ -7,6 +7,6 @@ dependencies {
         exclude group: 'commons-beanutils', module:'commons-beanutils'
     }
 
-    compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
-    testImplementation("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
+    compileOnly("org.hibernate.validator:hibernate-validator")
+    testImplementation("org.hibernate.validator:hibernate-validator")
 }
diff --git a/grails-datastore-gorm/build.gradle b/grails-datastore-gorm/build.gradle
@@ -9,11 +9,11 @@ dependencies {
     compileOnlyApi("jakarta.el:jakarta.el-api:$jakartaElVersion")
     runtimeOnly "org.glassfish:jakarta.el:$jakartaElGlassfishImplVersion"
 
-    compileOnly("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
+    compileOnly("org.hibernate.validator:hibernate-validator")
     compileOnly("org.springframework:spring-jdbc")
     compileOnly("org.springframework:spring-web")
     testImplementation("org.springframework:spring-jdbc")
-    testImplementation("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
+    testImplementation("org.hibernate.validator:hibernate-validator")
     testRuntimeOnly("com.h2database:h2")
 }