more lib version changes

dopplershift · Jun 8, 2023 · c61292a · c61292a
1 parent b35a3c9
commit c61292a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/tds-platform/build.gradle b/tds-platform/build.gradle
@@ -87,6 +87,7 @@ dependencies {
     api "org.hibernate.validator:hibernate-validator:${depVersion.hibernateValidator}"
     api "org.hibernate.validator:hibernate-validator-annotation-processor:${depVersion.hibernateValidator}"
     api 'jakarta.el:jakarta.el-api'
+    runtime 'org.glassfish:javax.el:3.0.0'
 
     // waterml stuff
     api 'org.apache.xmlbeans:xmlbeans'

diff --git a/tds/build.gradle b/tds/build.gradle
@@ -83,9 +83,8 @@ dependencies {
   'org.json:json'
 
   // JSR 303 with Hibernate Validator, which is dragging in jboss logging
-  compile 'jakarta.validation:jakarta.validation-api'
-  compile 'org.hibernate.validator:hibernate-validator'
-  runtime 'jakarta.el:jakarta.el-api'
+  runtime 'org.hibernate.validator:hibernate-validator'
+  runtime 'org.glassfish:javax.el'
   annotationProcessor "org.hibernate.validator:hibernate-validator-annotation-processor:${depVersion.hibernateValidator}"
 
   // @Resource annotation (removed post Java 8)

diff --git a/tds/src/test/java/thredds/server/ncss/validation/TestNcssParams.java b/tds/src/test/java/thredds/server/ncss/validation/TestNcssParams.java
@@ -11,7 +11,6 @@
 import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
-import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -26,8 +25,7 @@ public class TestNcssParams {
 
   @BeforeClass
   public static void setUp() {
-    ValidatorFactory factory = Validation.byDefaultProvider().configure()
-        .messageInterpolator(new ParameterMessageInterpolator()).buildValidatorFactory();
+    ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
     validator = factory.getValidator();
 
     Class c = NcssGridParamsBean.class;