You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2021/08/26 15:59:21 UTC
[unomi] 01/01: Attempting to upgrade CXF and hibernate-validator
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch draft-dependency-upgrades
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 0f381f76d1fa411039efb753c550ce92549eb90e
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Thu Aug 26 17:59:13 2021 +0200
Attempting to upgrade CXF and hibernate-validator
---
api/pom.xml | 6 ++---
graphql/karaf-feature/src/main/feature/feature.xml | 26 +++++++++++-----------
graphql/pom.xml | 3 ++-
kar/src/main/feature/feature.xml | 2 +-
pom.xml | 18 +++++++--------
rest/pom.xml | 6 ++---
6 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 8b16b1f..287c0dc 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -42,11 +42,11 @@
<artifactId>commons-lang3</artifactId>
</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>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>
diff --git a/graphql/karaf-feature/src/main/feature/feature.xml b/graphql/karaf-feature/src/main/feature/feature.xml
index 3579d2b..3da9ba9 100644
--- a/graphql/karaf-feature/src/main/feature/feature.xml
+++ b/graphql/karaf-feature/src/main/feature/feature.xml
@@ -38,20 +38,20 @@
<bundle start-level="80">wrap:mvn:com.squareup.okhttp3/okhttp/3.2.0</bundle>
<bundle start-level="80">wrap:mvn:com.squareup.okio/okio/1.6.0</bundle>
<bundle start-level="80">mvn:io.reactivex.rxjava2/rxjava/2.2.19</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-server/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-common/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-api/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-util/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-io/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-client/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-client/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-xml/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-servlet/9.4.28.v20200408</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-util/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-io/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-client/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-xml/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty.websocket.version}</bundle>
<bundle start-level="80">mvn:javax.servlet/javax.servlet-api/3.0.1</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-servlet/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-security/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-server/9.4.28.v20200408</bundle>
- <bundle start-level="80">mvn:org.eclipse.jetty/jetty-http/9.4.28.v20200408</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-servlet/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-security/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-server/${jetty.websocket.version}</bundle>
+ <bundle start-level="80">mvn:org.eclipse.jetty/jetty-http/${jetty.websocket.version}</bundle>
<bundle start-level="80" start="false">mvn:org.apache.unomi/cdp-graphql-api-impl/2.0.0-SNAPSHOT</bundle>
</feature>
</features>
diff --git a/graphql/pom.xml b/graphql/pom.xml
index 822a215..e0d1906 100644
--- a/graphql/pom.xml
+++ b/graphql/pom.xml
@@ -36,7 +36,8 @@
<graphql.java.annotations.version>8.0</graphql.java.annotations.version>
<graphql.java.extended.scalars.version>1.0</graphql.java.extended.scalars.version>
<reactivex.version>2.2.19</reactivex.version>
- <jetty.websocket.version>9.4.28.v20200408</jetty.websocket.version>
+ <!--jetty.websocket.version>9.4.28.v20200408</jetty.websocket.version-->
+ <jetty.websocket.version>9.4.22.v20191022</jetty.websocket.version>
</properties>
<modules>
diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index 2849ddf..774485c 100644
--- a/kar/src/main/feature/feature.xml
+++ b/kar/src/main/feature/feature.xml
@@ -20,7 +20,7 @@
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.cellar/apache-karaf-cellar/${version.karaf.cellar}/xml/features</repository>
- <repository>mvn:org.hibernate/hibernate-validator-osgi-karaf-features/${hibernate.validator.version}/xml/features</repository>
+ <repository>mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate.validator.version}/xml/features</repository>
<feature description="unomi-kar" version="${project.version}" name="unomi-kar"
start-level="70">
diff --git a/pom.xml b/pom.xml
index a82db61..98c14fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,17 +64,17 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.3.4</cxf.version>
- <version.jackson.core>2.9.10</version.jackson.core>
- <version.jackson.databind>2.9.10.8</version.jackson.databind>
- <version.jackson.jaxb>2.9.10</version.jackson.jaxb>
+ <cxf.version>3.4.4</cxf.version>
+ <version.jackson.core>2.12.4</version.jackson.core>
+ <version.jackson.databind>2.12.4</version.jackson.databind>
+ <version.jackson.jaxb>2.12.4</version.jackson.jaxb>
<version.karaf>4.2.8</version.karaf>
<version.karaf.cellar>4.2.1</version.karaf.cellar>
<version.pax.exam>4.13.1</version.pax.exam>
<elasticsearch.version>7.4.2</elasticsearch.version>
<groovy.version>3.0.3</groovy.version>
- <bean.validation.version>1.1.0.Final</bean.validation.version>
- <hibernate.validator.version>5.4.3.Final</hibernate.validator.version>
+ <bean.validation.version>2.0.2</bean.validation.version>
+ <hibernate.validator.version>6.2.0.Final</hibernate.validator.version>
<java.version>1.8</java.version>
@@ -925,13 +925,13 @@
<!-- dependencies for bean validation -->
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<version>${bean.validation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
<scope>provided</scope>
diff --git a/rest/pom.xml b/rest/pom.xml
index e7342ac..ad3e9d1 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -155,11 +155,11 @@
<scope>provided</scope>
</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>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>