[SYNCOPE-1402] (Temporary?) switching to hibernate-validator
authorFrancesco Chicchiriccò <ilgrosso@apache.org>
Fri, 28 Dec 2018 10:11:00 +0000 (11:11 +0100)
committerFrancesco Chicchiriccò <ilgrosso@apache.org>
Fri, 28 Dec 2018 10:11:00 +0000 (11:11 +0100)
core/persistence-jpa/pom.xml
fit/core-reference/pom.xml
pom.xml

index 99c99b8..ba2f644 100644 (file)
@@ -62,8 +62,12 @@ under the License.
     </dependency>
       
     <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-jsr</artifactId>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
     </dependency>
       
     <dependency>
index acdbde8..34e30c3 100644 (file)
@@ -1276,17 +1276,6 @@ under the License.
           <groupId>org.apache.syncope.core</groupId>
           <artifactId>syncope-core-persistence-jpa</artifactId>
           <version>${project.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>org.apache.bval</groupId>
-              <artifactId>bval-jsr</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.hibernate.validator</groupId>
-          <artifactId>hibernate-validator</artifactId>
-          <version>6.0.11.Final</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index b9b81d3..eeee497 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -398,7 +398,7 @@ under the License.
 
     <openjpa.version>3.0.0</openjpa.version>
     <hikaricp.version>3.2.0</hikaricp.version>
-    <bval.version>1.1.2</bval.version>
+    <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
 
     <jasypt.version>1.9.2</jasypt.version>
 
@@ -541,7 +541,7 @@ under the License.
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <version>2.0.1.Final</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
@@ -801,19 +801,14 @@ under the License.
       </dependency>
 
       <dependency>
-        <groupId>org.apache.bval</groupId>
-        <artifactId>bval-jsr</artifactId>
-        <version>${bval.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-          </exclusion>
-        </exclusions>
+        <groupId>org.hibernate.validator</groupId>
+        <artifactId>hibernate-validator</artifactId>
+        <version>${hibernate-validator.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.el</artifactId>
+        <version>3.0.1-b09</version>
       </dependency>
             
       <dependency>