This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a commit to branch upgrade-cxf
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 9e40f4b915dbaa48fbe7c4824691e4512ac1d71a
Author: jsinovassin <jsinovassinn...@jahia.com>
AuthorDate: Fri Jun 7 08:49:13 2024 +0200
upgrade cxf
---
.../src/main/feature/feature.xml | 1 +
extensions/router/router-rest/pom.xml | 8 ++++++-
kar/src/main/feature/feature.xml | 1 +
pom.xml | 25 ++++++++++++++++++++--
4 files changed, 32 insertions(+), 3 deletions(-)
diff --git
a/extensions/router/router-karaf-feature/src/main/feature/feature.xml
b/extensions/router/router-karaf-feature/src/main/feature/feature.xml
index 6d707cf67..73a2aff3d 100644
--- a/extensions/router/router-karaf-feature/src/main/feature/feature.xml
+++ b/extensions/router/router-karaf-feature/src/main/feature/feature.xml
@@ -33,6 +33,7 @@
<bundle
start-level="90">mvn:org.apache.camel/camel-stream/${camel.version}</bundle>
<bundle
start-level="90">mvn:org.apache.camel/camel-kafka/${camel.version}</bundle>
<bundle
start-level="90">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}</bundle>
+ <bundle
start-level="80">mvn:javax.validation/validation-api/${bean.validation.version}</bundle>
<bundle start-level="90"
start="false">mvn:org.apache.unomi/unomi-router-api/${project.version}</bundle>
<bundle start-level="90"
start="false">mvn:org.apache.unomi/unomi-router-core/${project.version}</bundle>
<bundle start-level="90"
start="false">mvn:org.apache.unomi/unomi-router-service/${project.version}</bundle>
diff --git a/extensions/router/router-rest/pom.xml
b/extensions/router/router-rest/pom.xml
index 2572908fa..e78ba25b6 100644
--- a/extensions/router/router-rest/pom.xml
+++ b/extensions/router/router-rest/pom.xml
@@ -53,6 +53,12 @@
<version>2.0.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
@@ -92,4 +98,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index cd4be3d37..d90495e95 100644
--- a/kar/src/main/feature/feature.xml
+++ b/kar/src/main/feature/feature.xml
@@ -62,6 +62,7 @@
<bundle
start-level="75">mvn:joda-time/joda-time/${joda-time.version}</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0</bundle>
<bundle
start-level="75">mvn:javax.annotation/javax.annotation-api/1.3.2</bundle>
+ <bundle
start-level="75">mvn:jakarta.jws/jakarta.jws-api/${jakarta.jws.version}</bundle>
<bundle
start-level="75">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle>
<bundle
start-level="75">mvn:commons-collections/commons-collections/${apache.commons.collections.version}</bundle>
<bundle start-level="70"
start="false">mvn:org.apache.unomi/unomi-lifecycle-watcher/${project.version}</bundle>
diff --git a/pom.xml b/pom.xml
index d50d50089..7de4dd70d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<properties>
<karaf.version>4.2.15</karaf.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.3.11</cxf.version>
+ <cxf.version>3.4.0</cxf.version>
<version.jackson.core>2.11.4</version.jackson.core>
<version.jackson.databind>2.11.4</version.jackson.databind>
<version.jackson.jaxb>2.11.4</version.jackson.jaxb>
@@ -82,6 +82,7 @@
<joda-time.version>2.12.7</joda-time.version>
<st4.version>4.3.4</st4.version>
<json-patch.version>1.9</json-patch.version>
+ <jakarta.jws.version>2.1.0</jakarta.jws.version>
<java.version>11</java.version>
@@ -697,6 +698,12 @@
<version>3.0.1</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>${jakarta.jws.version}</version>
+ </dependency>
+
<!-- Apache CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -726,7 +733,22 @@
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cxf.services.sts</groupId>
+ <artifactId>cxf-services-sts-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<!-- End of Apache CXF dependencies -->
<!-- Jackson dependencies -->
@@ -1021,7 +1043,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <_noimportjava>true</_noimportjava>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
</instructions>
</configuration>
