forked from pool/jersey
Fridrich Strba
72e16d0187
new package OBS-URL: https://build.opensuse.org/request/show/823088 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jersey?expand=0&rev=1
100 lines
4.8 KiB
Diff
100 lines
4.8 KiB
Diff
From 4aa4d572fc5aa6c76213940c1d1cf0792d8dc2ac Mon Sep 17 00:00:00 2001
|
|
From: Mat Booth <mat.booth@redhat.com>
|
|
Date: Mon, 11 Mar 2019 13:55:53 +0000
|
|
Subject: [PATCH 3/3] Port to hibernate validation 5.x
|
|
|
|
---
|
|
ext/bean-validation/pom.xml | 2 +-
|
|
ext/cdi/jersey-cdi1x-validation/pom.xml | 2 +-
|
|
.../cdi1x/validation/internal/CdiInterceptorWrapper.java | 4 ++--
|
|
.../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 7012856..ea3334b 100644
|
|
--- a/ext/bean-validation/pom.xml
|
|
+++ b/ext/bean-validation/pom.xml
|
|
@@ -87,7 +87,7 @@
|
|
<artifactId>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 1b25a2e..6b7ac98 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 5b808ce..16a098d 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 3b43ee7..1379866 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 7246f71..81d1a50 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -1765,13 +1765,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>
|
|
@@ -2080,7 +2080,7 @@
|
|
<simple.version>6.0.1</simple.version>
|
|
<slf4j.version>1.7.21</slf4j.version>
|
|
<spring4.version>4.3.8.RELEASE</spring4.version>
|
|
- <validation.impl.version>6.0.11.Final</validation.impl.version>
|
|
+ <validation.impl.version>5.1.3.Final</validation.impl.version>
|
|
<weld.version>2.2.14.Final</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
|
|
<weld3.version>3.0.0.Final</weld3.version>
|
|
<xerces.version>2.11.0</xerces.version>
|
|
--
|
|
2.20.1
|
|
|