Revert "HHH-13950 Update to Bean Validation 3 preview: Hibernate Vali…

…dator 7.0.0.Alpha1" This reverts commit b9a24f4.
hibernate · Apr 24, 2020 · 72f8c07 · 72f8c07
1 parent 3bc3322
commit 72f8c07
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
@@ -18,9 +18,9 @@ ext {
     jnpVersion = '5.0.6.CR1'
 
     hibernateCommonsVersion = '5.1.0.Final'
-    hibernateValidatorVersion = '7.0.0.Alpha1' // Preview of Jakarta EE 9 (Validation 3.0)
-    validationApiVersion = '3.0.0-M1' // Preview of Jakarta EE 9 (Validation 3.0)
-    elVersion = '4.0.0-RC1' // Preview of Jakarta EE 9 : dependency of Validation 3.0
+    hibernateValidatorVersion = '6.0.13.Final'
+    validationApiVersion = '2.0.1.Final'
+    elVersion = '3.0.1-b09'
 
     cdiVersion = '2.0'
     weldVersion = '3.0.0.Final'
@@ -74,7 +74,7 @@ ext {
             // javax
             jpa:            "javax.persistence:javax.persistence-api:${project.jpaVersion}",
             jta:            'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final',
-            validation:     "jakarta.validation:jakarta.validation-api:${validationApiVersion}",
+            validation:     "javax.validation:validation-api:${validationApiVersion}",
             jacc:           'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final',
             interceptor:    'javax.interceptor:javax.interceptor-api:1.2',
             // required by JAXB from JDK 9 as it is not available anymore in JDK 9
@@ -143,7 +143,7 @@ ext {
 
             validator:       "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}",
             // EL required by Hibernate Validator at test runtime
-            expression_language: "org.glassfish:jakarta.el:${elVersion}",
+            expression_language: "org.glassfish:javax.el:${elVersion}",
 
             c3p0:            "com.mchange:c3p0:0.9.5.3",
             ehcache:         "net.sf.ehcache:ehcache:2.10.6",

diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java
@@ -14,7 +14,7 @@
 import org.hibernate.internal.util.collections.CollectionHelper;
 
 /**
- * Duplicates the jakarta.validation enum (because jakarta validation might not be on the runtime classpath)
+ * Duplicates the javax.validation enum (because javax validation might not be on the runtime classpath)
  *
  * @author Steve Ebersole
  */

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/hhh9798/Shipment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/hhh9798/Shipment.java
@@ -15,7 +15,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.OneToOne;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 
 @Entity
 public class Shipment {