You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2024/10/31 02:38:39 UTC
(sling-org-apache-sling-api) branch jakarta updated: Switch from javax.servlet to jakarta.servlet
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
The following commit(s) were added to refs/heads/jakarta by this push:
new 6db7abc Switch from javax.servlet to jakarta.servlet
6db7abc is described below
commit 6db7abcb05f38ca48c23518fd0f41d45eaaa53ad
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 30 19:38:32 2024 -0700
Switch from javax.servlet to jakarta.servlet
---
pom.xml | 5 +-
.../java/org/apache/sling/api/SlingConstants.java | 46 +++++++++---------
.../apache/sling/api/SlingHttpServletRequest.java | 6 +--
.../apache/sling/api/SlingHttpServletResponse.java | 2 +-
.../apache/sling/api/SlingServletException.java | 2 +-
.../org/apache/sling/api/auth/Authenticator.java | 4 +-
.../api/auth/NoAuthenticationHandlerException.java | 4 +-
.../org/apache/sling/api/auth/package-info.java | 2 +-
.../org/apache/sling/api/request/RequestUtil.java | 6 +--
.../sling/api/request/SlingRequestEvent.java | 4 +-
.../builder/SlingHttpServletRequestBuilder.java | 2 +-
.../builder/SlingHttpServletResponseResult.java | 2 +-
.../api/request/builder/impl/HttpSessionImpl.java | 6 +--
.../request/builder/impl/ServletContextImpl.java | 56 +++++++++++++++++-----
.../builder/impl/SlingHttpServletRequestImpl.java | 30 ++++++------
.../builder/impl/SlingHttpServletResponseImpl.java | 8 ++--
.../sling/api/request/builder/package-info.java | 2 +-
.../sling/api/request/header/MediaRangeList.java | 2 +-
.../sling/api/request/header/package-info.java | 2 +-
.../org/apache/sling/api/request/package-info.java | 2 +-
.../org/apache/sling/api/resource/Resource.java | 2 +-
.../sling/api/resource/ResourceDecorator.java | 2 +-
.../sling/api/resource/ResourceProvider.java | 2 +-
.../sling/api/resource/ResourceResolver.java | 2 +-
.../sling/api/resource/mapping/ResourceMapper.java | 2 +-
.../sling/api/resource/mapping/package-info.java | 2 +-
.../apache/sling/api/resource/package-info.java | 2 +-
.../apache/sling/api/servlets/HtmlResponse.java | 2 +-
.../apache/sling/api/servlets/OptingServlet.java | 2 +-
.../apache/sling/api/servlets/ServletResolver.java | 10 ++--
.../api/servlets/ServletResolverConstants.java | 2 +-
.../sling/api/servlets/SlingAllMethodsServlet.java | 2 +-
.../api/servlets/SlingSafeMethodsServlet.java | 14 +++---
.../apache/sling/api/servlets/package-info.java | 2 +-
.../api/wrappers/ResourceResolverWrapper.java | 2 +-
.../wrappers/SlingHttpServletRequestWrapper.java | 6 +--
.../wrappers/SlingHttpServletResponseWrapper.java | 2 +-
.../sling/api/wrappers/SlingRequestPaths.java | 14 +++---
.../apache/sling/api/wrappers/package-info.java | 2 +-
.../apache/sling/api/request/RequestUtilTest.java | 6 +--
.../builder/impl/ServletContextImplTest.java | 14 +++---
.../impl/SlingHttpServletRequestImplTest.java | 6 +--
.../impl/SlingHttpServletResponseImplTest.java | 2 +-
.../api/wrappers/ResourceResolverWrapperTest.java | 2 +-
44 files changed, 166 insertions(+), 131 deletions(-)
diff --git a/pom.xml b/pom.xml
index a4fec49..6fd3e7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
diff --git a/src/main/java/org/apache/sling/api/SlingConstants.java b/src/main/java/org/apache/sling/api/SlingConstants.java
index 275ef21..a6734e9 100644
--- a/src/main/java/org/apache/sling/api/SlingConstants.java
+++ b/src/main/java/org/apache/sling/api/SlingConstants.java
@@ -60,7 +60,7 @@ public class SlingConstants {
* the serlvet or script is included via
* <code>RequestDispatcher.include</code> from another servlet or script.
* <p>
- * The type of the attribute value is <code>javax.servlet.Servlet</code>.
+ * The type of the attribute value is <code>jakarta.servlet.Servlet</code>.
*/
public static final String ATTR_REQUEST_SERVLET = "org.apache.sling.api.include.servlet";
@@ -94,7 +94,7 @@ public class SlingConstants {
* <code>HttpServletRequest.getRequestURI()</code> of the request which
* included the servlet currently being active underlying the
* <code>Servlet</code> which included the servlet currently being active
- * (value is "javax.servlet.include.request_uri"). This attribute is only
+ * (value is "jakarta.servlet.include.request_uri"). This attribute is only
* set if the serlvet or script is included via
* <code>RequestDispatcher.include</code> from another servlet or script.
* <p>
@@ -107,14 +107,14 @@ public class SlingConstants {
* script. This request attribute is set for compatibility with the Servlet
* API specification.
*/
- public static final String ATTR_INCLUDE_REQUEST_URI = "javax.servlet.include.request_uri";
+ public static final String ATTR_INCLUDE_REQUEST_URI = "jakarta.servlet.include.request_uri";
/**
* The name of the request attribute containing the
* <code>HttpServletRequest.getContextPath()</code> of the request which
* included the servlet currently being active underlying the
* <code>Servlet</code> which included the servlet currently being active
- * (value is "javax.servlet.include.context_path"). This attribute is only
+ * (value is "jakarta.servlet.include.context_path"). This attribute is only
* set if the serlvet or script is included via
* <code>RequestDispatcher.include</code> from another servlet or script.
* <p>
@@ -127,14 +127,14 @@ public class SlingConstants {
* script. This request attribute is set for compatibility with the Servlet
* API specification.
*/
- public static final String ATTR_INCLUDE_CONTEXT_PATH = "javax.servlet.include.context_path";
+ public static final String ATTR_INCLUDE_CONTEXT_PATH = "jakarta.servlet.include.context_path";
/**
* The name of the request attribute containing the
* <code>HttpServletRequest.getServletPath()</code> of the request which
* included the servlet currently being active underlying the
* <code>Servlet</code> which included the servlet currently being active
- * (value is "javax.servlet.include.servlet_path"). This attribute is only
+ * (value is "jakarta.servlet.include.servlet_path"). This attribute is only
* set if the serlvet or script is included via
* <code>RequestDispatcher.include</code> from another servlet or script.
* <p>
@@ -147,14 +147,14 @@ public class SlingConstants {
* script. This request attribute is set for compatibility with the Servlet
* API specification.
*/
- public static final String ATTR_INCLUDE_SERVLET_PATH = "javax.servlet.include.servlet_path";
+ public static final String ATTR_INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path";
/**
* The name of the request attribute containing the
* <code>HttpServletRequest.getPathInfo()</code> of the request which
* included the servlet currently being active underlying the
* <code>Servlet</code> which included the servlet currently being active
- * (value is "javax.servlet.include.path_info"). This attribute is only set
+ * (value is "jakarta.servlet.include.path_info"). This attribute is only set
* if the serlvet or script is included via
* <code>RequestDispatcher.include</code> from another servlet or script.
* <p>
@@ -166,14 +166,14 @@ public class SlingConstants {
* included servlet or script. This request attribute is set for
* compatibility with the Servlet API specification.
*/
- public static final String ATTR_INCLUDE_PATH_INFO = "javax.servlet.include.path_info";
+ public static final String ATTR_INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info";
/**
* The name of the request attribute containing the
* <code>HttpServletRequest.getQueryString()</code> of the request which
* included the servlet currently being active underlying the
* <code>Servlet</code> which included the servlet currently being active
- * (value is "javax.servlet.include.query_string"). This attribute is only
+ * (value is "jakarta.servlet.include.query_string"). This attribute is only
* set if the serlvet or script is included via
* <code>RequestDispatcher.include</code> from another servlet or script.
* <p>
@@ -186,25 +186,25 @@ public class SlingConstants {
* script. This request attribute is set for compatibility with the Servlet
* API specification.
*/
- public static final String ATTR_INCLUDE_QUERY_STRING = "javax.servlet.include.query_string";
+ public static final String ATTR_INCLUDE_QUERY_STRING = "jakarta.servlet.include.query_string";
// ---------- Error handling -----------------------------------------------
/**
* The name of the request attribute containing the exception thrown causing
* the error handler to be called (value is
- * "javax.servlet.error.exception"). This attribute is only available to
+ * "jakarta.servlet.error.exception"). This attribute is only available to
* error handling servlets and only if an exception has been thrown causing
* error handling.
* <p>
* The type of the attribute value is <code>java.lang.Throwable</code>.
*/
- public static final String ERROR_EXCEPTION = "javax.servlet.error.exception";
+ public static final String ERROR_EXCEPTION = "jakarta.servlet.error.exception";
/**
* The name of the request attribute containing the fully qualified class
* name of the exception thrown causing the error handler to be called
- * (value is "javax.servlet.error.exception_type"). This attribute is only
+ * (value is "jakarta.servlet.error.exception_type"). This attribute is only
* available to error handling servlets and only if an exception has been
* thrown causing error handling. This attribute is present for backwards
* compatibility only. Error handling servlet implementors are advised to
@@ -212,11 +212,11 @@ public class SlingConstants {
* <p>
* The type of the attribute value is <code>java.lang.String</code>.
*/
- public static final String ERROR_EXCEPTION_TYPE = "javax.servlet.error.exception_type";
+ public static final String ERROR_EXCEPTION_TYPE = "jakarta.servlet.error.exception_type";
/**
* The name of the request attribute containing the message of the error
- * situation (value is "javax.servlet.error.message"). If an exception
+ * situation (value is "jakarta.servlet.error.message"). If an exception
* caused error handling, this is the exceptions message from
* <code>Throwable.getMessage()</code>. If error handling is caused by a
* call to one of the <code>SlingHttpServletResponse.sendError</code>
@@ -224,30 +224,30 @@ public class SlingConstants {
* <p>
* The type of the attribute value is <code>java.lang.String</code>.
*/
- public static final String ERROR_MESSAGE = "javax.servlet.error.message";
+ public static final String ERROR_MESSAGE = "jakarta.servlet.error.message";
/**
* The name of the request attribute containing the URL requested by the
* client during whose processing the error handling was caused (value is
- * "javax.servlet.error.request_uri"). This property is retrieved calling
+ * "jakarta.servlet.error.request_uri"). This property is retrieved calling
* the <code>SlingHttpServletRequest.getRequestURI()</code> method.
* <p>
* The type of the attribute value is <code>java.lang.String</code>.
*/
- public static final String ERROR_REQUEST_URI = "javax.servlet.error.request_uri";
+ public static final String ERROR_REQUEST_URI = "jakarta.servlet.error.request_uri";
/**
* The name of the request attribute containing the name of the servlet
* which caused the error handling (value is
- * "javax.servlet.error.servlet_name").
+ * "jakarta.servlet.error.servlet_name").
* <p>
* The type of the attribute value is <code>java.lang.String</code>.
*/
- public static final String ERROR_SERVLET_NAME = "javax.servlet.error.servlet_name";
+ public static final String ERROR_SERVLET_NAME = "jakarta.servlet.error.servlet_name";
/**
* The name of the request attribute containing the status code sent to the
- * client (value is "javax.servlet.error.status_code"). Error handling
+ * client (value is "jakarta.servlet.error.status_code"). Error handling
* servlets may set this status code on their response to the client or they
* may choose to set another status code. For example a handler for
* NOT_FOUND status (404) may opt to redirect to a new location and thus not
@@ -258,7 +258,7 @@ public class SlingConstants {
* <p>
* The type of the attribute value is <code>java.lang.Integer</code>.
*/
- public static final String ERROR_STATUS = "javax.servlet.error.status_code";
+ public static final String ERROR_STATUS = "jakarta.servlet.error.status_code";
/**
* The topic for the OSGi event which is sent when a resource has been added
diff --git a/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java b/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
index c7354f9..4cc2c20 100644
--- a/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
@@ -25,9 +25,9 @@ import java.util.ResourceBundle;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.adapter.Adaptable;
import org.apache.sling.api.request.RequestDispatcherOptions;
diff --git a/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java b/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
index 59e023d..f7cb890 100644
--- a/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.adapter.Adaptable;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/src/main/java/org/apache/sling/api/SlingServletException.java b/src/main/java/org/apache/sling/api/SlingServletException.java
index 834c6d0..841cba8 100644
--- a/src/main/java/org/apache/sling/api/SlingServletException.java
+++ b/src/main/java/org/apache/sling/api/SlingServletException.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
/**
* The <code>SlingServletException</code> is a runtime exception wrapper for
diff --git a/src/main/java/org/apache/sling/api/auth/Authenticator.java b/src/main/java/org/apache/sling/api/auth/Authenticator.java
index 6eea22c..a99d919 100644
--- a/src/main/java/org/apache/sling/api/auth/Authenticator.java
+++ b/src/main/java/org/apache/sling/api/auth/Authenticator.java
@@ -19,8 +19,8 @@
package org.apache.sling.api.auth;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java b/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java
index 6acd9f3..12727fc 100644
--- a/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java
+++ b/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java
@@ -23,11 +23,11 @@ import org.apache.sling.api.SlingException;
/**
* The <code>NoAuthenticationHandlerException</code> is thrown to indicate that
* the
- * {@link Authenticator#login(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link Authenticator#login(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method could not find a way to authenticate the request user.
* <p>
* This exception is thrown without a message. The caller of the
- * {@link Authenticator#login(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link Authenticator#login(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method called is expected to immediately handle this exception and not to
* forward it up the call chain.
* <p>
diff --git a/src/main/java/org/apache/sling/api/auth/package-info.java b/src/main/java/org/apache/sling/api/auth/package-info.java
index 31227e5..5452fc2 100644
--- a/src/main/java/org/apache/sling/api/auth/package-info.java
+++ b/src/main/java/org/apache/sling/api/auth/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.4")
+@Version("2.0.0")
package org.apache.sling.api.auth;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/request/RequestUtil.java b/src/main/java/org/apache/sling/api/request/RequestUtil.java
index ecfde67..4c49c64 100644
--- a/src/main/java/org/apache/sling/api/request/RequestUtil.java
+++ b/src/main/java/org/apache/sling/api/request/RequestUtil.java
@@ -24,9 +24,9 @@ import java.util.Map;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.servlets.HttpConstants;
diff --git a/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java b/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
index abefaec..49aca05 100644
--- a/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
+++ b/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
@@ -19,8 +19,8 @@
package org.apache.sling.api.request;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
/**
* represents an event published by the Sling engine while
diff --git a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java
index 0c3675a..90c59b0 100644
--- a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java
+++ b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java
@@ -20,7 +20,7 @@ package org.apache.sling.api.request.builder;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestProgressTracker;
diff --git a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java
index c9e3039..4c3882a 100644
--- a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java
+++ b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api.request.builder;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
import org.apache.sling.api.SlingHttpServletResponse;
import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/HttpSessionImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/HttpSessionImpl.java
index 19db6a2..0a59244 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/HttpSessionImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/HttpSessionImpl.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
/**
* Internal {@link HttpSession} implementation.
@@ -148,7 +148,7 @@ public class HttpSessionImpl implements HttpSession {
// --- unsupported operations ---
@Override
@SuppressWarnings("deprecation")
- public javax.servlet.http.HttpSessionContext getSessionContext() {
+ public jakarta.servlet.http.HttpSessionContext getSessionContext() {
throw new UnsupportedOperationException();
}
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java
index 7c4731b..2ec3015 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java
@@ -25,17 +25,17 @@ import java.util.EventListener;
import java.util.Map;
import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRegistration.Dynamic;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRegistration.Dynamic;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
/**
* Internal {@link ServletContext} implementation.
@@ -303,4 +303,38 @@ public class ServletContextImpl implements ServletContext {
throw new UnsupportedOperationException();
}
+ @Override
+ public Dynamic addJspFile(String servletName, String jspFile) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getRequestCharacterEncoding() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getResponseCharacterEncoding() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int getSessionTimeout() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setRequestCharacterEncoding(String encoding) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setResponseCharacterEncoding(String encoding) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setSessionTimeout(int sessionTimeout) {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java
index dcb1314..89d85c4 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java
@@ -40,21 +40,21 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.ReadListener;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.adapter.SlingAdaptable;
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImpl.java
index f9df5a4..576ea82 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImpl.java
@@ -29,10 +29,10 @@ import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.adapter.SlingAdaptable;
diff --git a/src/main/java/org/apache/sling/api/request/builder/package-info.java b/src/main/java/org/apache/sling/api/request/builder/package-info.java
index e818dbc..26e9d94 100644
--- a/src/main/java/org/apache/sling/api/request/builder/package-info.java
+++ b/src/main/java/org/apache/sling/api/request/builder/package-info.java
@@ -16,5 +16,5 @@
* specific language governing permissions and limitations
* under the License.
*/
-@org.osgi.annotation.versioning.Version("1.3")
+@org.osgi.annotation.versioning.Version("2.0.0")
package org.apache.sling.api.request.builder;
diff --git a/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java b/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
index 430c158..cc26dbf 100644
--- a/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
+++ b/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.annotation.versioning.ConsumerType;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/api/request/header/package-info.java b/src/main/java/org/apache/sling/api/request/header/package-info.java
index 386b026..b4c2169 100644
--- a/src/main/java/org/apache/sling/api/request/header/package-info.java
+++ b/src/main/java/org/apache/sling/api/request/header/package-info.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.0.0")
+@Version("2.0.0")
package org.apache.sling.api.request.header;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/request/package-info.java b/src/main/java/org/apache/sling/api/request/package-info.java
index f265b91..299b799 100644
--- a/src/main/java/org/apache/sling/api/request/package-info.java
+++ b/src/main/java/org/apache/sling/api/request/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.7.0")
+@Version("3.0.0")
package org.apache.sling.api.request;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/Resource.java b/src/main/java/org/apache/sling/api/resource/Resource.java
index 5907637..c2dd000 100644
--- a/src/main/java/org/apache/sling/api/resource/Resource.java
+++ b/src/main/java/org/apache/sling/api/resource/Resource.java
@@ -57,7 +57,7 @@ public interface Resource extends Adaptable {
*
* @see #getResourceType()
* @see ResourceUtil#isNonExistingResource(Resource)
- * @see ResourceResolver#resolve(javax.servlet.http.HttpServletRequest,
+ * @see ResourceResolver#resolve(jakarta.servlet.http.HttpServletRequest,
* String)
*/
String RESOURCE_TYPE_NON_EXISTING = "sling:nonexisting";
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java b/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
index 23095b5..cbff50a 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
@@ -18,7 +18,7 @@ package org.apache.sling.api.resource;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.annotation.versioning.ConsumerType;
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceProvider.java b/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
index e33cbc8..9b6d208 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.annotation.versioning.ConsumerType;
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceResolver.java b/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
index 8ec4708..d66bb95 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.adapter.Adaptable;
import org.apache.sling.api.resource.mapping.ResourceMapper;
diff --git a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
index a302469..f090c33 100644
--- a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
+++ b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
@@ -20,7 +20,7 @@ package org.apache.sling.api.resource.mapping;
import java.util.Collection;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.resource.ResourceResolver;
import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/apache/sling/api/resource/mapping/package-info.java b/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
index e871225..12b4908 100644
--- a/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.1")
+@Version("2.0.0")
package org.apache.sling.api.resource.mapping;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/package-info.java b/src/main/java/org/apache/sling/api/resource/package-info.java
index 9ec07b2..508af2e 100644
--- a/src/main/java/org/apache/sling/api/resource/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.13.2")
+@Version("3.0.0")
package org.apache.sling.api.resource;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java b/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java
index 6e477a4..8befc2e 100644
--- a/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java
+++ b/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java
@@ -25,7 +25,7 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.request.ResponseUtil;
diff --git a/src/main/java/org/apache/sling/api/servlets/OptingServlet.java b/src/main/java/org/apache/sling/api/servlets/OptingServlet.java
index 4a56d94..9da2eb8 100644
--- a/src/main/java/org/apache/sling/api/servlets/OptingServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/OptingServlet.java
@@ -19,7 +19,7 @@
package org.apache.sling.api.servlets;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
import org.apache.sling.api.SlingHttpServletRequest;
diff --git a/src/main/java/org/apache/sling/api/servlets/ServletResolver.java b/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
index 8cb8ae9..beb54de 100644
--- a/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
+++ b/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
@@ -20,7 +20,7 @@ package org.apache.sling.api.servlets;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
@@ -30,7 +30,7 @@ import org.osgi.annotation.versioning.ProviderType;
/**
* The <code>ServletResolver</code> defines the API for a service capable of
- * resolving <code>javax.servlet.Servlet</code> instances to handle the
+ * resolving <code>jakarta.servlet.Servlet</code> instances to handle the
* processing of a request or resource.
* <p>
* Applications of the Sling Framework generally do not need the servlet
@@ -41,7 +41,7 @@ import org.osgi.annotation.versioning.ProviderType;
public interface ServletResolver {
/**
- * Resolves a <code>javax.servlet.Servlet</code> whose
+ * Resolves a <code>jakarta.servlet.Servlet</code> whose
* <code>service</code> method may be used to handle the given
* <code>request</code>.
* <p>
@@ -66,7 +66,7 @@ public interface ServletResolver {
@Nullable Servlet resolveServlet(@NotNull SlingHttpServletRequest request);
/**
- * Resolves a <code>javax.servlet.Servlet</code> whose
+ * Resolves a <code>jakarta.servlet.Servlet</code> whose
* <code>service</code> method may be used to handle a request.
* <p>
* The returned servlet must be assumed to be initialized and ready to run.
@@ -96,7 +96,7 @@ public interface ServletResolver {
@Nullable Servlet resolveServlet(@NotNull Resource resource, @NotNull String scriptName);
/**
- * Resolves a <code>javax.servlet.Servlet</code> whose
+ * Resolves a <code>jakarta.servlet.Servlet</code> whose
* <code>service</code> method may be used to handle a request.
* <p>
* The returned servlet must be assumed to be initialized and ready to run.
diff --git a/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java b/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java
index b1caca6..8e454d2 100644
--- a/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java
+++ b/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java
@@ -145,7 +145,7 @@ public final class ServletResolverConstants {
* <code>component.name</code> property or the <code>service.pid</code>
* is used. If none of the three properties is defined, the Servlet is
* ignored.
- * @see javax.servlet.ServletConfig#getServletName()
+ * @see jakarta.servlet.ServletConfig#getServletName()
*/
public static final String SLING_SERVLET_NAME = "sling.core.servletName";
diff --git a/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java b/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java
index 7666fe9..4ddb322 100644
--- a/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Method;
import java.util.Map;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
diff --git a/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java b/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java
index 1d25ce9..d40c9d8 100644
--- a/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java
@@ -27,13 +27,13 @@ import java.util.HashMap;
import java.util.Map;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.GenericServlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
diff --git a/src/main/java/org/apache/sling/api/servlets/package-info.java b/src/main/java/org/apache/sling/api/servlets/package-info.java
index 9c31c3e..f25f4b9 100644
--- a/src/main/java/org/apache/sling/api/servlets/package-info.java
+++ b/src/main/java/org/apache/sling/api/servlets/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.4.0")
+@Version("3.0.0")
package org.apache.sling.api.servlets;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java b/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java
index 9fa46d4..65da2c5 100644
--- a/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
diff --git a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
index a5402c6..57b1717 100644
--- a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
@@ -23,9 +23,9 @@ import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
diff --git a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
index 317e293..29cb5c0 100644
--- a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.api.wrappers;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import org.apache.sling.api.SlingHttpServletResponse;
diff --git a/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java b/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java
index 6684787..31e09ee 100644
--- a/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java
+++ b/src/main/java/org/apache/sling/api/wrappers/SlingRequestPaths.java
@@ -18,12 +18,12 @@
*/
package org.apache.sling.api.wrappers;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* This class is not a "wrapper" per se, but computes the correct path info,
* request URI, etc. for included requests. When including a request via
- * {@link javax.servlet.RequestDispatcher}, the Servlet API specifies that
+ * {@link jakarta.servlet.RequestDispatcher}, the Servlet API specifies that
* target paths of the included request are available as request attributes.
* {@code Request.getPathInfo()}, for example will return the value for the
* including request, *not* for the included one.
@@ -37,31 +37,31 @@ public class SlingRequestPaths {
* Attribute name used by the RequestDispatcher to indicate the context path
* of the included request, as a String.
*/
- public static final String INCLUDE_CONTEXT_PATH = "javax.servlet.include.context_path";
+ public static final String INCLUDE_CONTEXT_PATH = "jakarta.servlet.include.context_path";
/**
* Attribute name used by the RequestDispatcher to indicate the path info of
* the included request, as a String.
*/
- public static final String INCLUDE_PATH_INFO = "javax.servlet.include.path_info";
+ public static final String INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info";
/**
* Attribute name used by the RequestDispatcher to indicate the query string
* of the included request, as a String.
*/
- public static final String INCLUDE_QUERY_STRING = "javax.servlet.include.query_string";
+ public static final String INCLUDE_QUERY_STRING = "jakarta.servlet.include.query_string";
/**
* Attribute name used by the RequestDispatcher to indicate the request URI
* of the included request, as a String.
*/
- public static final String INCLUDE_REQUEST_URI = "javax.servlet.include.request_uri";
+ public static final String INCLUDE_REQUEST_URI = "jakarta.servlet.include.request_uri";
/**
* Attribute name used by the RequestDispatcher to indicate the servlet path
* of the included request, as a String.
*/
- public static final String INCLUDE_SERVLET_PATH = "javax.servlet.include.servlet_path";
+ public static final String INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path";
/**
* Return the context path for r, using the appropriate request attribute if
diff --git a/src/main/java/org/apache/sling/api/wrappers/package-info.java b/src/main/java/org/apache/sling/api/wrappers/package-info.java
index 8a2b990..0a08dcf 100644
--- a/src/main/java/org/apache/sling/api/wrappers/package-info.java
+++ b/src/main/java/org/apache/sling/api/wrappers/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.8.0")
+@Version("3.0.0")
package org.apache.sling.api.wrappers;
import org.osgi.annotation.versioning.Version;
diff --git a/src/test/java/org/apache/sling/api/request/RequestUtilTest.java b/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
index af09ef4..b58af12 100644
--- a/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
+++ b/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
@@ -23,9 +23,9 @@ import java.io.PrintWriter;
import java.util.Collection;
import java.util.Locale;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
diff --git a/src/test/java/org/apache/sling/api/request/builder/impl/ServletContextImplTest.java b/src/test/java/org/apache/sling/api/request/builder/impl/ServletContextImplTest.java
index a256627..9b33663 100644
--- a/src/test/java/org/apache/sling/api/request/builder/impl/ServletContextImplTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/impl/ServletContextImplTest.java
@@ -24,13 +24,13 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.EventListener;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServlet;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImplTest.java b/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImplTest.java
index 7d84954..f7ce3e0 100644
--- a/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImplTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImplTest.java
@@ -36,9 +36,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
diff --git a/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImplTest.java b/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImplTest.java
index c7b1bbd..b466635 100644
--- a/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImplTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseImplTest.java
@@ -32,7 +32,7 @@ import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Locale;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java b/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java
index 2bf4f87..51a9ff9 100644
--- a/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java
+++ b/src/test/java/org/apache/sling/api/wrappers/ResourceResolverWrapperTest.java
@@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;