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
The following commit(s) were added to refs/heads/draft-dependency-upgrades by
this push:
new 12be05a - Switch back to bean validation 1.1.0 / hibernate validator
5.4.1 - Fix Jackson databind versions - Moved Jackson dataformat YAML bundle
out of WAB because it was causing scanning issues
12be05a is described below
commit 12be05a6453649a09ed2cfbb930cd00087231ad3
Author: Serge Huber <[email protected]>
AuthorDate: Fri Sep 10 14:19:01 2021 +0200
- Switch back to bean validation 1.1.0 / hibernate validator 5.4.1
- Fix Jackson databind versions
- Moved Jackson dataformat YAML bundle out of WAB because it was causing
scanning issues
---
api/pom.xml | 6 +++---
extensions/router/router-rest/pom.xml | 2 +-
kar/src/main/feature/feature.xml | 5 +++--
pom.xml | 12 ++++++------
rest/pom.xml | 6 +++---
wab/pom.xml | 1 +
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 272d1d9..8a3747f 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -48,11 +48,11 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate.validator</groupId>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/router/router-rest/pom.xml
b/extensions/router/router-rest/pom.xml
index 9213f42..b3fc379 100644
--- a/extensions/router/router-rest/pom.xml
+++ b/extensions/router/router-rest/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${version.jackson.core}</version>
+ <version>${version.jackson.databind}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index fbdd9b0..af6d6ea 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.validator/hibernate-validator-osgi-karaf-features/${hibernate.validator.version}/xml/features</repository>
+
<repository>mvn:org.hibernate/hibernate-validator-osgi-karaf-features/${hibernate.validator.version}/xml/features</repository>
<feature description="unomi-kar" version="${project.version}"
name="unomi-kar"
start-level="70">
@@ -51,11 +51,12 @@
<bundle start-level="75">mvn:com.google.guava/guava/16.0.1</bundle>
<bundle
start-level="75">mvn:com.github.fge/jackson-coreutils/1.8</bundle>
<bundle start-level="75">mvn:com.github.fge/json-patch/1.9</bundle>
- <bundle
start-level="75">mvn:com.fasterxml.jackson.core/jackson-databind/${version.jackson.core}</bundle>
+ <bundle
start-level="75">mvn:com.fasterxml.jackson.core/jackson-databind/${version.jackson.databind}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.core/jackson-annotations/${version.jackson.core}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${version.jackson.core}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${version.jackson.jaxb}</bundle>
<bundle
start-level="75">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${version.jackson.core}</bundle>
+ <bundle
start-level="75">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${version.jackson.core}</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/1.4_1</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/2.3_1</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0</bundle>
diff --git a/pom.xml b/pom.xml
index a98b90f..d88c16d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,8 @@
<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>2.0.2</bean.validation.version>
- <hibernate.validator.version>6.2.0.Final</hibernate.validator.version>
+ <bean.validation.version>1.1.0.Final</bean.validation.version>
+ <hibernate.validator.version>5.4.1.Final</hibernate.validator.version>
<java.version>1.8</java.version>
@@ -750,7 +750,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${version.jackson.core}</version>
+ <version>${version.jackson.databind}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -925,13 +925,13 @@
<!-- dependencies for bean validation -->
<dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
<version>${bean.validation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hibernate.validator</groupId>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
<scope>provided</scope>
diff --git a/rest/pom.xml b/rest/pom.xml
index 9c48a6a..77ae8fc 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -155,12 +155,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hibernate.validator</groupId>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/wab/pom.xml b/wab/pom.xml
index accca9a..961a5cb 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -66,6 +66,7 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${version.jackson.core}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
