File _service:tar_scm:0001-Port-to-hibernate-validat... of Package jersey

File _service:tar_scm:0001-Port-to-hibernate-validation-5.x.patch of Package jersey (Revision d009d8d59d79020125c945abd557a452)

Currently displaying revision d009d8d59d79020125c945abd557a452 , Show latest

From 227cdb9bce8e2b5f20983e8c0a600b56233fdbcb Mon Sep 17 00:00:00 2001
From: guoxiaoqi <guoxiaoqi2@huawei.com>
Date: Thu, 13 May 2021 17:10:06 +0800
Subject: [PATCH] Port to hibernate validation 5.x

Signed-off-by: guoxiaoqi <guoxiaoqi2@huawei.com>
---
 ext/bean-validation/pom.xml                                         | 2 +-
 ext/cdi/jersey-cdi1x-validation/pom.xml                             | 2 +-
 .../jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java | 4 ++--
 .../cdi1x/validation/internal/CdiInterceptorWrapperExtension.java   | 2 +-
 pom.xml                                                             | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
index d490857..6fe0bc3 100644
--- a/ext/bean-validation/pom.xml
+++ b/ext/bean-validation/pom.xml
@@ -87,7 +87,7 @@
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.validator</groupId>
+            <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
 
diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml
index 7991cef..a4436a8 100644
--- a/ext/cdi/jersey-cdi1x-validation/pom.xml
+++ b/ext/cdi/jersey-cdi1x-validation/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate.validator</groupId>
+            <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java
index 1d3d9d9..5175ae9 100644
--- a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java
+++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java
@@ -27,8 +27,8 @@ import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
 
-import org.hibernate.validator.cdi.internal.interceptor.MethodValidated;
-import org.hibernate.validator.cdi.internal.interceptor.ValidationInterceptor;
+import org.hibernate.validator.internal.cdi.interceptor.MethodValidated;
+import org.hibernate.validator.internal.cdi.interceptor.ValidationInterceptor;
 
 /**
  * JAX-RS wrapper for Hibernate CDI bean validation interceptor.
diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java
index acd1b5c..0561d0e 100644
--- a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java
+++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java
@@ -43,7 +43,7 @@ import javax.interceptor.Interceptor;
 import org.glassfish.jersey.internal.util.collection.Cache;
 import org.glassfish.jersey.server.model.Resource;
 
-import org.hibernate.validator.cdi.internal.interceptor.ValidationInterceptor;
+import org.hibernate.validator.internal.cdi.interceptor.ValidationInterceptor;
 
 /**
  * CDI extension to register {@link CdiInterceptorWrapper}.
diff --git a/pom.xml b/pom.xml
index d07459d..38eda41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1810,13 +1810,13 @@
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate.validator</groupId>
+                <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator</artifactId>
                 <version>${validation.impl.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate.validator</groupId>
+                <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator-cdi</artifactId>
                 <version>${validation.impl.version}</version>
             </dependency>
@@ -2136,7 +2136,7 @@
         <spring4.version>4.3.20.RELEASE</spring4.version>
         <spring5.version>5.1.5.RELEASE</spring5.version>
         <surefire.version>3.0.0-M3</surefire.version>
-        <validation.impl.version>6.0.17.Final</validation.impl.version>
+        <validation.impl.version>5.2.4.Final</validation.impl.version>
         <weld.version>2.2.14.Final</weld.version> 
         <weld3.version>3.0.0.Final</weld3.version>
         <xerces.version>2.11.0</xerces.version>
-- 
1.8.3.1