backing out of changes

dopplershift · May 17, 2023 · f06ea6f · f06ea6f
1 parent 1cc9529
commit f06ea6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/gradle/any/shared-mvn-coords.gradle b/gradle/any/shared-mvn-coords.gradle
@@ -27,7 +27,7 @@ ext {
   // gradle seems to have issues with the compileOnly configuration, so we need to provide the full maven
   // coordinates for javax.servlet-api if the gradle plugin in applied. If we don't, we see errors like this:
   depVersion.javaxServletApi = '3.1.0'
-  depVersion.hibernateValidator = '8.0.0.Final'
+  depVersion.hibernateValidator = '6.1.5.Final'
   // TODO: figure out way to keep this version in sync with netcdf-java version
   // It is included in the netcdf-java-bom (via netcdf-java-platform), but we can't
   // reference that version in a gradle build script (see gradle/any/protobuf.gradle)

diff --git a/tds-platform/build.gradle b/tds-platform/build.gradle
@@ -83,11 +83,11 @@ dependencies {
     api 'org.json:json:20230227'
     api 'com.coverity.security:coverity-escapers:1.1.1'
     api 'org.thymeleaf:thymeleaf-spring5:3.0.15.RELEASE'
-    api 'jakarta.validation:jakarta.validation-api:3.0.2'
+    api 'javax.validation:validation-api:2.0.1.Final'
     api "org.hibernate.validator:hibernate-validator:${depVersion.hibernateValidator}"
     api "org.hibernate.validator:hibernate-validator-annotation-processor:${depVersion.hibernateValidator}"
-    api 'javax.el:javax.el-api:3.0.1-b06'
-    api 'org.glassfish:jakarta.el:4.0.2'
+    api 'javax.el:javax.el-api:3.0.0'
+    api 'org.glassfish:javax.el:3.0.0'
 
     // waterml stuff
     api 'org.apache.xmlbeans:xmlbeans'

diff --git a/tds/build.gradle b/tds/build.gradle
@@ -88,7 +88,7 @@ dependencies {
   compile 'javax.validation:validation-api'
   runtime 'org.hibernate.validator:hibernate-validator'
   runtime 'javax.el:javax.el-api'
-  runtime 'org.glassfish:jakarta.el'
+  runtime 'org.glassfish:javax.el'
   annotationProcessor "org.hibernate.validator:hibernate-validator-annotation-processor:${depVersion.hibernateValidator}"
 
   // @Resource annotation (removed post Java 8)