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 11d24a757 UNOMI-829: change javax.servlet to jakarta.servlet
11d24a757 is described below
commit 11d24a757e6bddc54f569226a8fdbd9f705de90f
Author: jsinovassin <jsinovassinn...@jahia.com>
AuthorDate: Tue May 7 11:21:47 2024 +0300
UNOMI-829: change javax.servlet to jakarta.servlet
---
extensions/geonames/rest/pom.xml | 6 +++---
extensions/groovy-actions/rest/pom.xml | 4 ++--
extensions/json-schema/rest/pom.xml | 4 ++--
extensions/lists-extension/rest/pom.xml | 6 +++---
extensions/privacy-extension/rest/pom.xml | 7 +++----
extensions/router/router-rest/pom.xml | 4 ++--
extensions/salesforce-connector/rest/pom.xml | 4 ++--
extensions/unomi-mailchimp/rest/pom.xml | 4 ++--
graphql/cxs-impl/pom.xml | 4 ++--
graphql/karaf-feature/src/main/feature/feature.xml | 2 +-
plugins/baseplugin/pom.xml | 4 ++--
plugins/request/pom.xml | 4 ++--
.../request/actions/RequestHeaderToProfilePropertyAction.java | 2 +-
.../actions/RequestParameterToProfilePropertyAction.java | 2 +-
.../unomi/plugins/request/actions/SetRemoteHostInfoAction.java | 2 +-
pom.xml | 7 ++++---
rest/pom.xml | 4 ++--
.../java/org/apache/unomi/rest/endpoints/ClientEndpoint.java | 4 ++--
.../org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java | 6 +++---
.../apache/unomi/rest/endpoints/EventsCollectorEndpoint.java | 4 ++--
.../apache/unomi/rest/endpoints/ProfileServiceEndPoint.java | 2 +-
.../org/apache/unomi/rest/endpoints/QueryServiceEndPoint.java | 2 +-
.../java/org/apache/unomi/rest/service/RestServiceUtils.java | 4 ++--
.../apache/unomi/rest/service/impl/RestServiceUtilsImpl.java | 7 +++----
.../rest/validation/request/RequestValidatorInterceptor.java | 2 +-
.../main/java/org/apache/unomi/utils/EventsRequestContext.java | 4 ++--
rest/src/main/java/org/apache/unomi/utils/HttpUtils.java | 6 +++---
services/pom.xml | 4 ++--
wab/pom.xml | 4 ++--
wab/src/main/java/org/apache/unomi/web/ClientServlet.java | 10 +++++-----
wab/src/main/java/org/apache/unomi/web/ContextServlet.java | 10 +++++-----
.../main/java/org/apache/unomi/web/EventsCollectorServlet.java | 10 +++++-----
.../org/apache/unomi/web/HttpServletRequestForwardWrapper.java | 8 ++++----
wab/src/main/java/org/apache/unomi/web/HttpUtils.java | 6 +++---
34 files changed, 81 insertions(+), 82 deletions(-)
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index dd5dd64f9..de56544da 100644
--- a/extensions/geonames/rest/pom.xml
+++ b/extensions/geonames/rest/pom.xml
@@ -45,8 +45,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -86,4 +86,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/extensions/groovy-actions/rest/pom.xml
b/extensions/groovy-actions/rest/pom.xml
index 9347a2d91..67aec7005 100644
--- a/extensions/groovy-actions/rest/pom.xml
+++ b/extensions/groovy-actions/rest/pom.xml
@@ -45,8 +45,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/json-schema/rest/pom.xml
b/extensions/json-schema/rest/pom.xml
index 48f45e65e..f61f74dd1 100644
--- a/extensions/json-schema/rest/pom.xml
+++ b/extensions/json-schema/rest/pom.xml
@@ -52,8 +52,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/lists-extension/rest/pom.xml
b/extensions/lists-extension/rest/pom.xml
index 9006da67d..70cc4ebf2 100644
--- a/extensions/lists-extension/rest/pom.xml
+++ b/extensions/lists-extension/rest/pom.xml
@@ -46,8 +46,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -87,4 +87,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/extensions/privacy-extension/rest/pom.xml
b/extensions/privacy-extension/rest/pom.xml
index 1119b7c91..3ed8d0dce 100644
--- a/extensions/privacy-extension/rest/pom.xml
+++ b/extensions/privacy-extension/rest/pom.xml
@@ -45,11 +45,10 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -107,4 +106,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/extensions/router/router-rest/pom.xml
b/extensions/router/router-rest/pom.xml
index a2691320e..eddd8bd21 100644
--- a/extensions/router/router-rest/pom.xml
+++ b/extensions/router/router-rest/pom.xml
@@ -82,8 +82,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions/salesforce-connector/rest/pom.xml
b/extensions/salesforce-connector/rest/pom.xml
index 6ad36fae8..57e8d75aa 100644
--- a/extensions/salesforce-connector/rest/pom.xml
+++ b/extensions/salesforce-connector/rest/pom.xml
@@ -45,8 +45,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions/unomi-mailchimp/rest/pom.xml
b/extensions/unomi-mailchimp/rest/pom.xml
index 3937b4094..34c6bbad3 100644
--- a/extensions/unomi-mailchimp/rest/pom.xml
+++ b/extensions/unomi-mailchimp/rest/pom.xml
@@ -37,8 +37,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/graphql/cxs-impl/pom.xml b/graphql/cxs-impl/pom.xml
index 273ab7d31..e5abc06ef 100644
--- a/graphql/cxs-impl/pom.xml
+++ b/graphql/cxs-impl/pom.xml
@@ -35,8 +35,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/graphql/karaf-feature/src/main/feature/feature.xml
b/graphql/karaf-feature/src/main/feature/feature.xml
index b7dbdfb3f..3c5659906 100644
--- a/graphql/karaf-feature/src/main/feature/feature.xml
+++ b/graphql/karaf-feature/src/main/feature/feature.xml
@@ -46,7 +46,7 @@
<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:jakarta.servlet/jakarta.servlet-api/${jakarta.servlet.version}</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>
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 631eb316b..361cac4ae 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -32,8 +32,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index 327d4ae53..aa00367ea 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -32,8 +32,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestHeaderToProfilePropertyAction.java
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestHeaderToProfilePropertyAction.java
index b6cb0c0a8..b134fbe40 100644
---
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestHeaderToProfilePropertyAction.java
+++
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestHeaderToProfilePropertyAction.java
@@ -22,7 +22,7 @@ import org.apache.unomi.api.actions.Action;
import org.apache.unomi.api.actions.ActionExecutor;
import org.apache.unomi.api.services.EventService;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Copies a request header value to a profile property
diff --git
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestParameterToProfilePropertyAction.java
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestParameterToProfilePropertyAction.java
index be4e08493..fc380d87d 100644
---
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestParameterToProfilePropertyAction.java
+++
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/RequestParameterToProfilePropertyAction.java
@@ -22,7 +22,7 @@ import org.apache.unomi.api.actions.Action;
import org.apache.unomi.api.actions.ActionExecutor;
import org.apache.unomi.api.services.EventService;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Copies a request parameter to a profile property
diff --git
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
index 58527fed7..35af85d3a 100644
---
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
+++
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/pom.xml b/pom.xml
index 30c47e2a1..52107dc81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
<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>
+ <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
<java.version>11</java.version>
@@ -684,9 +685,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta.servlet.version}</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
diff --git a/rest/pom.xml b/rest/pom.xml
index ab228cdc5..fbdbebdf0 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -67,8 +67,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
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 23fb0006d..6d36fa0ee 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
@@ -30,8 +30,8 @@ import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import jakarta.jws.WebService;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.NotFoundException;
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 035ad8303..a08e21b54 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
@@ -35,9 +35,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.jws.WebService;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
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/EventsCollectorEndpoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/EventsCollectorEndpoint.java
index 565f297f2..a01adbfc7 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
@@ -29,8 +29,8 @@ import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import jakarta.jws.WebService;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.OPTIONS;
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 d2d4887ff..9e334e67a 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
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
import jakarta.jws.WebMethod;
import jakarta.jws.WebService;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
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/QueryServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/endpoints/QueryServiceEndPoint.java
index c6c27f6f3..2176d60c9 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
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
import jakarta.jws.WebMethod;
import jakarta.jws.WebService;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
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/service/RestServiceUtils.java
b/rest/src/main/java/org/apache/unomi/rest/service/RestServiceUtils.java
index 153b6ad11..42a0abd2f 100644
--- a/rest/src/main/java/org/apache/unomi/rest/service/RestServiceUtils.java
+++ b/rest/src/main/java/org/apache/unomi/rest/service/RestServiceUtils.java
@@ -20,8 +20,8 @@ package org.apache.unomi.rest.service;
import org.apache.unomi.api.Event;
import org.apache.unomi.utils.EventsRequestContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
diff --git
a/rest/src/main/java/org/apache/unomi/rest/service/impl/RestServiceUtilsImpl.java
b/rest/src/main/java/org/apache/unomi/rest/service/impl/RestServiceUtilsImpl.java
index cdd92741b..6b77aed1f 100644
---
a/rest/src/main/java/org/apache/unomi/rest/service/impl/RestServiceUtilsImpl.java
+++
b/rest/src/main/java/org/apache/unomi/rest/service/impl/RestServiceUtilsImpl.java
@@ -33,14 +33,13 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.ws.rs.BadRequestException;
import java.util.Date;
import java.util.List;
import java.util.UUID;
-import java.util.stream.Collectors;
@Component(service = RestServiceUtils.class)
public class RestServiceUtilsImpl implements RestServiceUtils {
diff --git
a/rest/src/main/java/org/apache/unomi/rest/validation/request/RequestValidatorInterceptor.java
b/rest/src/main/java/org/apache/unomi/rest/validation/request/RequestValidatorInterceptor.java
index ae19c1039..9c8b64656 100644
---
a/rest/src/main/java/org/apache/unomi/rest/validation/request/RequestValidatorInterceptor.java
+++
b/rest/src/main/java/org/apache/unomi/rest/validation/request/RequestValidatorInterceptor.java
@@ -24,7 +24,7 @@ import org.apache.cxf.phase.Phase;
import org.apache.unomi.api.services.ConfigSharingService;
import org.apache.unomi.rest.exception.InvalidRequestException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
diff --git
a/rest/src/main/java/org/apache/unomi/utils/EventsRequestContext.java
b/rest/src/main/java/org/apache/unomi/utils/EventsRequestContext.java
index 679887568..c832e7983 100644
--- a/rest/src/main/java/org/apache/unomi/utils/EventsRequestContext.java
+++ b/rest/src/main/java/org/apache/unomi/utils/EventsRequestContext.java
@@ -20,8 +20,8 @@ import org.apache.unomi.api.Profile;
import org.apache.unomi.api.Session;
import org.apache.unomi.api.services.EventService;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Date;
/**
diff --git a/rest/src/main/java/org/apache/unomi/utils/HttpUtils.java
b/rest/src/main/java/org/apache/unomi/utils/HttpUtils.java
index 87572eb22..ff260df3a 100644
--- a/rest/src/main/java/org/apache/unomi/utils/HttpUtils.java
+++ b/rest/src/main/java/org/apache/unomi/utils/HttpUtils.java
@@ -29,8 +29,8 @@ import org.apache.unomi.schema.api.SchemaService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
@@ -79,7 +79,7 @@ public class HttpUtils {
stringBuilder.append(" none");
} else {
for (Cookie cookie : cookies) {
- stringBuilder.append("
").append(cookie.getName()).append("=").append(cookie.getValue()).append("
domain=").append(cookie.getDomain()).append("
path=").append(cookie.getPath()).append("
maxAge=").append(cookie.getMaxAge()).append("
httpOnly=").append(cookie.isHttpOnly()).append("
secure=").append(cookie.getSecure()).append("
version=").append(cookie.getVersion()).append("
comment=").append(cookie.getComment()).append("\n");
+ stringBuilder.append("
").append(cookie.getName()).append("=").append(cookie.getValue()).append("
domain=").append(cookie.getDomain()).append("
path=").append(cookie.getPath()).append("
maxAge=").append(cookie.getMaxAge()).append("
httpOnly=").append(cookie.isHttpOnly()).append("
secure=").append(cookie.getSecure()).append("\n");
}
}
return stringBuilder.toString();
diff --git a/services/pom.xml b/services/pom.xml
index 59fc04bd7..a68a877ac 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -58,8 +58,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/wab/pom.xml b/wab/pom.xml
index 058e4c1c2..2c47f3284 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -32,8 +32,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
b/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
index 6a979f776..f909750f2 100644
--- a/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ClientServlet.java
@@ -21,11 +21,11 @@ import org.apache.unomi.api.services.ConfigSharingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
diff --git a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
index bb28ac1a2..624a75cfa 100644
--- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
@@ -21,11 +21,11 @@ import org.apache.unomi.api.services.ConfigSharingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
diff --git a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
index ae623e8a0..b8ef99714 100644
--- a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
@@ -20,11 +20,11 @@ package org.apache.unomi.web;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
diff --git
a/wab/src/main/java/org/apache/unomi/web/HttpServletRequestForwardWrapper.java
b/wab/src/main/java/org/apache/unomi/web/HttpServletRequestForwardWrapper.java
index 717df0994..16c8ea2c3 100644
---
a/wab/src/main/java/org/apache/unomi/web/HttpServletRequestForwardWrapper.java
+++
b/wab/src/main/java/org/apache/unomi/web/HttpServletRequestForwardWrapper.java
@@ -19,10 +19,10 @@ package org.apache.unomi.web;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collections;
import java.util.Enumeration;
diff --git a/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
b/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
index 664d105d0..08434fb24 100644
--- a/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
+++ b/wab/src/main/java/org/apache/unomi/web/HttpUtils.java
@@ -17,9 +17,9 @@
package org.apache.unomi.web;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
public class HttpUtils {
