This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/dependency-updates by this
push:
new cbc94a50a UNOMI-829: upgrade java version, change javax to jakarta and
upgrade cxf
cbc94a50a is described below
commit cbc94a50a515141bb18ad0058af8249e8c9dd3d9
Author: jsinovassin <[email protected]>
AuthorDate: Tue May 7 09:36:06 2024 +0300
UNOMI-829: upgrade java version, change javax to jakarta and upgrade cxf
---
.../unomi/geonames/rest/GeonamesEndPoint.java | 4 +--
.../groovy/actions/rest/GroovyActionsEndPoint.java | 4 +--
.../unomi/schema/rest/JsonSchemaEndPoint.java | 4 +--
.../unomi/lists/rest/UserListServiceEndPoint.java | 4 +--
.../unomi/privacy/rest/PrivacyServiceEndPoint.java | 4 +--
.../src/main/feature/feature.xml | 1 +
extensions/router/router-rest/pom.xml | 8 ++++-
.../rest/ExportConfigurationServiceEndPoint.java | 4 +--
.../rest/ImportConfigurationServiceEndPoint.java | 4 +--
extensions/salesforce-connector/rest/pom.xml | 10 +-----
.../org/apache/unomi/sfdc/rest/SFDCEndPoint.java | 4 +--
.../unomi/mailchimp/rest/MailChimpEndPoint.java | 4 +--
package/pom.xml | 21 ------------
pom.xml | 39 ++++++++++++----------
.../rest/endpoints/CampaignsServiceEndPoint.java | 4 +--
.../unomi/rest/endpoints/ClientEndpoint.java | 2 +-
.../rest/endpoints/ClusterServiceEndPoint.java | 4 +--
.../unomi/rest/endpoints/ContextJsonEndpoint.java | 2 +-
.../rest/endpoints/DefinitionsServiceEndPoint.java | 4 +--
.../unomi/rest/endpoints/EventServiceEndpoint.java | 4 +--
.../rest/endpoints/EventsCollectorEndpoint.java | 2 +-
.../unomi/rest/endpoints/GoalsServiceEndPoint.java | 4 +--
.../unomi/rest/endpoints/PatchServiceEndPoint.java | 2 +-
.../rest/endpoints/ProfileServiceEndPoint.java | 6 ++--
.../unomi/rest/endpoints/QueryServiceEndPoint.java | 4 +--
.../unomi/rest/endpoints/RulesServiceEndPoint.java | 4 +--
.../unomi/rest/endpoints/ScopeServiceEndPoint.java | 4 +--
.../rest/endpoints/ScoringServiceEndPoint.java | 4 +--
.../rest/endpoints/SegmentServiceEndPoint.java | 4 +--
.../rest/endpoints/UserListServiceEndPoint.java | 4 +--
30 files changed, 78 insertions(+), 95 deletions(-)
diff --git
a/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java
b/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java
index e53216fe6..0265e3fa0 100644
---
a/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java
+++
b/extensions/geonames/rest/src/main/java/org/apache/unomi/geonames/rest/GeonamesEndPoint.java
@@ -27,8 +27,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
diff --git
a/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java
b/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java
index 86cc09228..036f25357 100644
---
a/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java
+++
b/extensions/groovy-actions/rest/src/main/java/org/apache/unomi/groovy/actions/rest/GroovyActionsEndPoint.java
@@ -27,8 +27,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.POST;
diff --git
a/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java
b/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java
index 4064edf20..a19c01ce9 100644
---
a/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java
+++
b/extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java
@@ -27,8 +27,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
diff --git
a/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java
b/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java
index 98ca0f119..46659e08c 100644
---
a/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java
+++
b/extensions/lists-extension/rest/src/main/java/org/apache/unomi/lists/rest/UserListServiceEndPoint.java
@@ -28,8 +28,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
diff --git
a/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
b/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
index 8c3dafc1b..e7c613620 100644
---
a/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
+++
b/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
@@ -23,8 +23,8 @@ import org.apache.unomi.api.services.PrivacyService;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
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 56c6e129f..b86a60ac1 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="90">mvn:jakarta.jws/jakarta.jws-api/${jakarta.jws.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..a2691320e 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>
+ <version>${jakarta.jws.version}</version>
+ <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/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java
b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java
index ff31a891d..7ab790c3e 100644
---
a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java
+++
b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java
@@ -26,8 +26,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
diff --git
a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
index db0f15159..ce7a28ba7 100644
---
a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
+++
b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
@@ -28,8 +28,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.ws.rs.Consumes;
diff --git a/extensions/salesforce-connector/rest/pom.xml
b/extensions/salesforce-connector/rest/pom.xml
index b60053fb0..6ad36fae8 100644
--- a/extensions/salesforce-connector/rest/pom.xml
+++ b/extensions/salesforce-connector/rest/pom.xml
@@ -49,14 +49,6 @@
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <version>${cxf.version}</version>
- <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -150,4 +142,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/extensions/salesforce-connector/rest/src/main/java/org/apache/unomi/sfdc/rest/SFDCEndPoint.java
b/extensions/salesforce-connector/rest/src/main/java/org/apache/unomi/sfdc/rest/SFDCEndPoint.java
index 85158e255..c236dfa71 100644
---
a/extensions/salesforce-connector/rest/src/main/java/org/apache/unomi/sfdc/rest/SFDCEndPoint.java
+++
b/extensions/salesforce-connector/rest/src/main/java/org/apache/unomi/sfdc/rest/SFDCEndPoint.java
@@ -25,8 +25,8 @@ import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
diff --git
a/extensions/unomi-mailchimp/rest/src/main/java/org/apache/unomi/mailchimp/rest/MailChimpEndPoint.java
b/extensions/unomi-mailchimp/rest/src/main/java/org/apache/unomi/mailchimp/rest/MailChimpEndPoint.java
index 18025489e..73219ba29 100644
---
a/extensions/unomi-mailchimp/rest/src/main/java/org/apache/unomi/mailchimp/rest/MailChimpEndPoint.java
+++
b/extensions/unomi-mailchimp/rest/src/main/java/org/apache/unomi/mailchimp/rest/MailChimpEndPoint.java
@@ -21,8 +21,8 @@ import org.apache.unomi.mailchimp.services.MailChimpService;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
diff --git a/package/pom.xml b/package/pom.xml
index c71652e69..2e80034af 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -367,27 +367,6 @@
<feature>unomi-groovy-actions</feature>
<feature>unomi-rest-ui</feature>
</bootFeatures>
- <!--
- <libraries>
-
<library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true;delegate:=true</library>
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true</library>
-
<library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version};type:=endorsed;export:=true</library>
-
<library>mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true</library>
-
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library>
-
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library>
-
-
<library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
-
<library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
- </libraries>
- -->
<javase>1.8</javase>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index a34d466c6..921eed133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,17 +55,12 @@
<url>https://issues.apache.org/jira/browse/UNOMI</url>
</issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/unomi-master</url>
- </ciManagement>
-
<inceptionYear>2014</inceptionYear>
<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.6.3</cxf.version>
<version.jackson.core>2.10.5</version.jackson.core>
<version.jackson.databind>2.10.5.1</version.jackson.databind>
<version.jackson.jaxb>2.10.5</version.jackson.jaxb>
@@ -78,16 +73,14 @@
<groovy.version>3.0.3</groovy.version>
<networknt.version>1.4.0</networknt.version>
<bean.validation.version>1.1.0.Final</bean.validation.version>
+ <jakarta.jws.version>3.0.0</jakarta.jws.version>
- <java.version>1.8</java.version>
+ <java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <scala.version>2.12.6</scala.version>
<encoding>UTF-8</encoding>
- <scala-maven-plugin.version>4.3.0</scala-maven-plugin.version>
-
<!-- Librairies for Karaf packaging -->
<xerces.version>2.11.0_1</xerces.version>
<servicemix.specs.version>2.9.0</servicemix.specs.version>
@@ -677,7 +670,6 @@
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
@@ -696,6 +688,11 @@
<artifactId>javax.servlet-api</artifactId>
<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>
@@ -726,6 +723,20 @@
<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 -->
@@ -944,12 +955,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jakarta-regexp</artifactId>
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/CampaignsServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/CampaignsServiceEndPoint.java
index f01d153c7..da40d5eda 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/CampaignsServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/CampaignsServiceEndPoint.java
@@ -31,8 +31,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.Set;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ClientEndpoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ClientEndpoint.java
index 4f7fb1298..23fb0006d 100644
--- a/rest/src/main/java/org/apache/unomi/rest/endpoints/ClientEndpoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/endpoints/ClientEndpoint.java
@@ -29,7 +29,7 @@ import org.apache.unomi.rest.service.RestServiceUtils;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ClusterServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ClusterServiceEndPoint.java
index d0c7cf29b..9d7bfe71a 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ClusterServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ClusterServiceEndPoint.java
@@ -26,8 +26,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
index df04e6d6c..035ad8303 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
@@ -34,7 +34,7 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/DefinitionsServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/DefinitionsServiceEndPoint.java
index acd76ba2b..aee909274 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/DefinitionsServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/DefinitionsServiceEndPoint.java
@@ -33,8 +33,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.*;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/EventServiceEndpoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/EventServiceEndpoint.java
index f1bac4d1f..e007cc362 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/EventServiceEndpoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/EventServiceEndpoint.java
@@ -24,8 +24,8 @@ import org.apache.unomi.api.services.EventService;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/EventsCollectorEndpoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/EventsCollectorEndpoint.java
index c9b3109dd..565f297f2 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/EventsCollectorEndpoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/EventsCollectorEndpoint.java
@@ -28,7 +28,7 @@ import org.apache.unomi.utils.EventsRequestContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/GoalsServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/GoalsServiceEndPoint.java
index 936986a76..27fe287f2 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/GoalsServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/GoalsServiceEndPoint.java
@@ -28,8 +28,8 @@ import org.apache.unomi.api.services.GoalsService;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.Set;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/PatchServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/PatchServiceEndPoint.java
index 338bf4189..142ff5bef 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/PatchServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/PatchServiceEndPoint.java
@@ -23,7 +23,7 @@ import org.apache.unomi.api.services.PatchService;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ProfileServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ProfileServiceEndPoint.java
index e07f36df1..d2d4887ff 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ProfileServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ProfileServiceEndPoint.java
@@ -32,8 +32,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
@@ -399,7 +399,7 @@ public class ProfileServiceEndPoint {
public Session loadSession(@PathParam("sessionId") String sessionId)
throws ParseException {
return profileService.loadSession(sessionId);
}
-
+
/**
* Saves the specified session.
*
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/QueryServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/QueryServiceEndPoint.java
index 83a656e4e..c6c27f6f3 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/QueryServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/QueryServiceEndPoint.java
@@ -28,8 +28,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/RulesServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/RulesServiceEndPoint.java
index 91298ee9e..60af59a31 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/RulesServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/RulesServiceEndPoint.java
@@ -29,8 +29,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.Map;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ScopeServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ScopeServiceEndPoint.java
index cc4110b12..221fbbf3e 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ScopeServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ScopeServiceEndPoint.java
@@ -25,8 +25,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ScoringServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ScoringServiceEndPoint.java
index bf3176a55..6c9c0ef74 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/ScoringServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/ScoringServiceEndPoint.java
@@ -30,8 +30,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.List;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/SegmentServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/SegmentServiceEndPoint.java
index 3cd547598..2b3c25cef 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/SegmentServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/SegmentServiceEndPoint.java
@@ -30,8 +30,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.List;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/endpoints/UserListServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/UserListServiceEndPoint.java
index 468e28edb..ff89519b2 100644
---
a/rest/src/main/java/org/apache/unomi/rest/endpoints/UserListServiceEndPoint.java
+++
b/rest/src/main/java/org/apache/unomi/rest/endpoints/UserListServiceEndPoint.java
@@ -30,8 +30,8 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import java.util.List;
