diff --git a/build.gradle b/build.gradle index 7f810285a9f..31de9b465b5 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,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 index e94df1108dc..bfd519f8c8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,9 +15,7 @@ gradleNexusPublishPluginVersion=1.3.0 grailsAsyncVersion=6.0.0-M1 grailsVersion=7.0.0-SNAPSHOT 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 index 71f3618c754..beee958babd 100644 --- 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:$grailsAsyncVersion" } diff --git a/grails-datastore-gorm-validation/build.gradle b/grails-datastore-gorm-validation/build.gradle index c30ecf66700..cbb610478bc 100644 --- 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 index 6c9d62bb6fd..561a8a33a37 100644 --- 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") }