Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "HHH-13950 Update to Bean Validation 3 preview: Hibernate Validator 7.0.0.Alpha1" 

This reverts commit b9a24f458c.
This commit is contained in:
Sanne Grinovero 2020-05-11 18:00:20 +01:00
parent 6dd7d09ba0
commit bc12eee661
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gradle/libraries.gradle
View File

@ -15,9 +15,9 @@ ext {
jnpVersion = '5.0.6.CR1' jnpVersion = '5.0.6.CR1'
hibernateCommonsVersion = '5.1.0.Final' hibernateCommonsVersion = '5.1.0.Final'
hibernateValidatorVersion = '7.0.0.Alpha1' // Preview of Jakarta EE 9 (Validation 3.0) hibernateValidatorVersion = '6.0.13.Final'
validationApiVersion = '3.0.0-M1' // Preview of Jakarta EE 9 (Validation 3.0) validationApiVersion = '2.0.1.Final'
elVersion = '4.0.0-RC1' // Preview of Jakarta EE 9 : dependency of Validation 3.0 elVersion = '3.0.1-b09'
cdiVersion = '2.0' cdiVersion = '2.0'
weldVersion = '3.0.0.Final' weldVersion = '3.0.0.Final'
@ -68,7 +68,7 @@ ext {
// javax // javax
jpa: "javax.persistence:javax.persistence-api:${project.jpaVersion}", jpa: "javax.persistence:javax.persistence-api:${project.jpaVersion}",
jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final', 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', 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', interceptor: 'javax.interceptor:javax.interceptor-api:1.2',
// required by JAXB from JDK 9 as it is not available anymore in JDK 9 // required by JAXB from JDK 9 as it is not available anymore in JDK 9
@ -130,7 +130,7 @@ ext {
validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}", validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}",
// EL required by Hibernate Validator at test runtime // 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", c3p0: "com.mchange:c3p0:0.9.5.3",
ehcache: "net.sf.ehcache:ehcache:2.10.6", ehcache: "net.sf.ehcache:ehcache:2.10.6",

2
hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java
View File

@ -13,7 +13,7 @@ import java.util.Set;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
/** /**
* 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 * @author Steve Ebersole
*/ */