diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle index c230015891..622bc8f56a 100644 --- a/hibernate-c3p0/hibernate-c3p0.gradle +++ b/hibernate-c3p0/hibernate-c3p0.gradle @@ -16,6 +16,5 @@ dependencies { testImplementation project( ':hibernate-testing' ) testImplementation jakartaLibs.validation testImplementation testLibs.validator - testRuntimeOnly testLibs.expressly } diff --git a/hibernate-c3p0/src/test/resources/META-INF/validation.xml b/hibernate-c3p0/src/test/resources/META-INF/validation.xml new file mode 100644 index 0000000000..04cc24117f --- /dev/null +++ b/hibernate-c3p0/src/test/resources/META-INF/validation.xml @@ -0,0 +1,15 @@ + + + + org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator + diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index b84985ddc3..bfcac032ab 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -56,7 +56,6 @@ dependencies { testImplementation jakartaLibs.cdi testImplementation jakartaLibs.jacc testImplementation jakartaLibs.validation - testImplementation testLibs.expressly testImplementation( testLibs.validator ) { // for test runtime transitive = true diff --git a/hibernate-core/src/test/resources/META-INF/validation.xml b/hibernate-core/src/test/resources/META-INF/validation.xml new file mode 100644 index 0000000000..04cc24117f --- /dev/null +++ b/hibernate-core/src/test/resources/META-INF/validation.xml @@ -0,0 +1,15 @@ + + + + org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator + diff --git a/hibernate-spatial/hibernate-spatial.gradle b/hibernate-spatial/hibernate-spatial.gradle index feef67cf07..bcaea76038 100644 --- a/hibernate-spatial/hibernate-spatial.gradle +++ b/hibernate-spatial/hibernate-spatial.gradle @@ -29,7 +29,6 @@ dependencies { testImplementation jdbcLibs.postgresql testImplementation jdbcLibs.h2gis - testRuntimeOnly testLibs.expressly testRuntimeOnly 'jaxen:jaxen:1.1' testRuntimeOnly libs.byteBuddy } diff --git a/hibernate-spatial/src/test/resources/META-INF/validation.xml b/hibernate-spatial/src/test/resources/META-INF/validation.xml new file mode 100644 index 0000000000..04cc24117f --- /dev/null +++ b/hibernate-spatial/src/test/resources/META-INF/validation.xml @@ -0,0 +1,15 @@ + + + + org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator + diff --git a/settings.gradle b/settings.gradle index 9dd6992b6e..bbbfb685ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -186,10 +186,8 @@ dependencyResolutionManagement { def jfrUnitVersion = version "jfrUnit", "1.0.0.Alpha2" def hibernateValidatorVersion = version "hibernateValidator", "9.0.0.Beta3" - def expresslyVersion = version "expressly", "6.0.0-M1" library( "validator", "org.hibernate.validator", "hibernate-validator" ).versionRef( hibernateValidatorVersion ) - library( "expressly", "org.glassfish.expressly", "expressly" ).versionRef( expresslyVersion ) library( "junit5Api", "org.junit.jupiter", "junit-jupiter-api" ).versionRef( junit5Version ) library( "junit5Engine", "org.junit.jupiter", "junit-jupiter-engine" ).versionRef( junit5Version )