Do not rely on expressly for Hibernate Validator message interpolation

marko-bekhta · beikov · commit 58d2239d850a · 2024-12-12T17:01:38.000+01:00
diff --git 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
@@ -0,0 +1,15 @@
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<validation-config
+        xmlns="https://jakarta.ee/xml/ns/validation/configuration"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/configuration
+            https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
+        version="3.0">
+
+    <message-interpolator>org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator</message-interpolator>
+</validation-config>
diff --git 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
@@ -0,0 +1,15 @@
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<validation-config
+        xmlns="https://jakarta.ee/xml/ns/validation/configuration"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/configuration
+            https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
+        version="3.0">
+
+    <message-interpolator>org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator</message-interpolator>
+</validation-config>
diff --git 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
@@ -0,0 +1,15 @@
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<validation-config
+        xmlns="https://jakarta.ee/xml/ns/validation/configuration"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/configuration
+            https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
+        version="3.0">
+
+    <message-interpolator>org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator</message-interpolator>
+</validation-config>
diff --git 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 )

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,5 @@ dependencies {`
`16`	`16`	`testImplementation project( ':hibernate-testing' )`
`17`	`17`	`testImplementation jakartaLibs.validation`
`18`	`18`	`testImplementation testLibs.validator`
`19`		`- testRuntimeOnly testLibs.expressly`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ dependencies {`
`29`	`29`	`testImplementation jdbcLibs.postgresql`
`30`	`30`	`testImplementation jdbcLibs.h2gis`
`31`	`31`
`32`		`- testRuntimeOnly testLibs.expressly`
`33`	`32`	`testRuntimeOnly 'jaxen:jaxen:1.1'`
`34`	`33`	`testRuntimeOnly libs.byteBuddy`
`35`	`34`	`}`