You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2020/01/10 07:27:25 UTC
[cxf] 01/01: [CXF-8151] Upgrade to Bean Validation 2.x and
Hibernate Validator 6.1.0
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-8151_bean-validation
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ede9a9ef93719eef0a25ff52c79167f82e031422
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Fri Jan 10 08:24:51 2020 +0100
[CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0
---
core/pom.xml | 4 ++--
distribution/javadoc/pom.xml | 4 ++--
.../release/samples/jax_rs/description_swagger2_web/pom.xml | 4 ++--
integration/spring-boot/autoconfigure/pom.xml | 4 ++--
integration/spring-boot/starter-jaxrs/pom.xml | 4 ++--
integration/spring-boot/starter-jaxws/pom.xml | 4 ++--
osgi/karaf/features/src/main/resources/features.xml | 6 +++---
parent/pom.xml | 10 +++++-----
rt/frontend/jaxrs/pom.xml | 4 ++--
systests/cdi/base/pom.xml | 4 ++--
systests/cdi/cdi-owb/pom.xml | 4 ++--
systests/cdi/cdi-weld/pom.xml | 4 ++--
systests/jaxrs/pom.xml | 4 ++--
systests/spring-boot/pom.xml | 9 ---------
tools/wadlto/jaxrs/pom.xml | 4 ++--
15 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 82da697..5fd9bfd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -88,8 +88,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 19bdc8a..df4eb25 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -139,8 +139,8 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>${cxf.asm.groupId}</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index bb7f6df..55ca2b6 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -88,8 +88,8 @@ under the License.
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml
index d7a5136..74c3b1c 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -99,8 +99,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Test -->
diff --git a/integration/spring-boot/starter-jaxrs/pom.xml b/integration/spring-boot/starter-jaxrs/pom.xml
index 7359f0d..f617e36 100644
--- a/integration/spring-boot/starter-jaxrs/pom.xml
+++ b/integration/spring-boot/starter-jaxrs/pom.xml
@@ -75,8 +75,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/integration/spring-boot/starter-jaxws/pom.xml b/integration/spring-boot/starter-jaxws/pom.xml
index 69f1f6e..1f8a145 100644
--- a/integration/spring-boot/starter-jaxws/pom.xml
+++ b/integration/spring-boot/starter-jaxws/pom.xml
@@ -70,8 +70,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 00829d7..f3ea8d3 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -314,7 +314,7 @@
<bundle start-level="35">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${project.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}</bundle>
<bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${cxf.jackson.version}</bundle>
- <bundle start-level="10" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle>
+ <bundle start-level="10" dependency="true">mvn:jakarta.validation/jakarta.validation-api/${cxf.validation.api.version}</bundle>
<bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.javassist/javassist/${cxf.javassist.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version}</bundle>
@@ -332,7 +332,7 @@
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-openapi-v3/${project.version}</bundle>
<bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${cxf.jackson.version}</bundle>
<bundle start-level="35" dependency="true">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle>
- <bundle start-level="10" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle>
+ <bundle start-level="10" dependency="true">mvn:jakarta.validation/jakarta.validation-api/${cxf.validation.api.version}</bundle>
<bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle>
<bundle start-level="30" dependency="true">mvn:io.github.classgraph/classgraph/${cxf.classgraph.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.javassist/javassist/${cxf.javassist.version}</bundle>
@@ -542,7 +542,7 @@
<!-- This feature has the wrong name; it's hibernate-only. Fix up in 3.2.0? Move all this to the
hibernate-bean-validation-helper feature -->
<bundle start-level="30" dependency="true">mvn:org.hibernate/hibernate-validator/${cxf.hibernate.validator.version}</bundle>
- <bundle start-level="30" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle>
+ <bundle start-level="30" dependency="true">mvn:jakarta.validation/jakarta.validation-api/${cxf.validation.api.version}</bundle>
<!-- The servicemix bundle for hibernate demands joda-time -->
<bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${cxf.servicemix.jodatime.version}</bundle>
<!-- The servicemix bundle for hibernate demands jsoup -->
diff --git a/parent/pom.xml b/parent/pom.xml
index 364a370..806c262 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -123,7 +123,7 @@
<cxf.hazelcast.version>3.12.3</cxf.hazelcast.version>
<cxf.hibernate.em.version>5.4.8.Final</cxf.hibernate.em.version>
<cxf.hibernate.jpa.version>1.0.2.Final</cxf.hibernate.jpa.version>
- <cxf.hibernate.validator.version>5.2.5.Final</cxf.hibernate.validator.version>
+ <cxf.hibernate.validator.version>6.1.0.Final</cxf.hibernate.validator.version>
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
@@ -211,8 +211,8 @@
<!-- the Export-Package is the same as the Maven artifact
version (with the Final), but we don't want an import package with a version
with a qualifier. We do want a range. -->
- <cxf.validation.api.package.version>[1.0.0,2)</cxf.validation.api.package.version>
- <cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version>
+ <cxf.validation.api.package.version>[1.0.0,3)</cxf.validation.api.package.version>
+ <cxf.validation.api.version>2.0.1</cxf.validation.api.version>
<cxf.velocity.version>2.1</cxf.velocity.version>
<cxf.wiremock.version>2.23.2</cxf.wiremock.version>
<cxf.woodstox.core.version>5.2.1</cxf.woodstox.core.version>
@@ -1564,8 +1564,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<version>${cxf.validation.api.version}</version>
<optional>true</optional>
</dependency>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 2ef4789..65b7ca8 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -54,8 +54,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml
index b6dd4c2..9589899 100644
--- a/systests/cdi/base/pom.xml
+++ b/systests/cdi/base/pom.xml
@@ -87,8 +87,8 @@
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index 6074890..455bf86 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml
index d52a47e..a59d15f 100644
--- a/systests/cdi/cdi-weld/pom.xml
+++ b/systests/cdi/cdi-weld/pom.xml
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index e1e2064..38a54c5 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -41,8 +41,8 @@
<version>${cxf.javassist.version}</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
diff --git a/systests/spring-boot/pom.xml b/systests/spring-boot/pom.xml
index 4800783..2e033e2 100644
--- a/systests/spring-boot/pom.xml
+++ b/systests/spring-boot/pom.xml
@@ -72,15 +72,6 @@
</plugin>
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>2.0.1.Final</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index f89fc69..8060b80 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -66,8 +66,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>