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/11/01 12:42:49 UTC
(sling-org-apache-sling-auth-core) branch jakarta updated: Migrate 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-auth-core.git
The following commit(s) were added to refs/heads/jakarta by this push:
new 22f4266 Migrate from javax.servlet to jakarta.servlet
22f4266 is described below
commit 22f42664d4d2b4b6db0e97320c41bc9518f458c2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 1 05:42:42 2024 -0700
Migrate from javax.servlet to jakarta.servlet
---
pom.xml | 12 +++++++-----
.../org/apache/sling/auth/core/AuthConstants.java | 10 +++++-----
.../java/org/apache/sling/auth/core/AuthUtil.java | 8 ++++----
.../sling/auth/core/AuthenticationSupport.java | 4 ++--
.../apache/sling/auth/core/LoginEventDecorator.java | 2 +-
.../impl/AbstractAuthenticationHandlerHolder.java | 4 ++--
.../auth/core/impl/AuthenticationHandlerHolder.java | 4 ++--
.../core/impl/AuthenticatorWebConsolePlugin.java | 10 +++++-----
.../core/impl/HttpBasicAuthenticationHandler.java | 4 ++--
.../apache/sling/auth/core/impl/LoginServlet.java | 4 ++--
.../apache/sling/auth/core/impl/LogoutServlet.java | 4 ++--
.../sling/auth/core/impl/PathBasedHolderCache.java | 2 +-
.../sling/auth/core/impl/SlingAuthenticator.java | 20 ++++++++++----------
.../engine/EngineAuthenticationHandlerHolder.java | 4 ++--
.../core/impl/engine/EngineSlingAuthenticator.java | 4 ++--
.../org/apache/sling/auth/core/package-info.java | 4 ++--
.../core/spi/AbstractAuthenticationFormServlet.java | 6 +++---
.../auth/core/spi/AbstractAuthenticationHandler.java | 4 ++--
.../auth/core/spi/AuthenticationFeedbackHandler.java | 4 ++--
.../sling/auth/core/spi/AuthenticationHandler.java | 4 ++--
.../sling/auth/core/spi/AuthenticationInfo.java | 6 +++---
.../core/spi/AuthenticationInfoPostProcessor.java | 4 ++--
.../spi/DefaultAuthenticationFeedbackHandler.java | 4 ++--
.../org/apache/sling/auth/core/spi/package-info.java | 4 ++--
.../sling/engine/auth/AuthenticationHandler.java | 4 ++--
.../apache/sling/engine/auth/AuthenticationInfo.java | 4 ++--
.../org/apache/sling/engine/auth/Authenticator.java | 4 ++--
.../org/apache/sling/engine/auth/package-info.java | 4 ++--
.../org/apache/sling/auth/core/AuthUtilTest.java | 2 +-
.../auth/core/impl/SlingAuthenticatorOsgiTest.java | 4 ++--
.../sling/auth/core/impl/SlingAuthenticatorTest.java | 10 +++++-----
31 files changed, 85 insertions(+), 83 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2b071d6..d866326 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.auth.core</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Sling Auth Core</name>
<description>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.25.4</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -108,8 +108,9 @@
<scope>provided</scope>
</dependency>
<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>
<dependency>
@@ -119,7 +120,8 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ <artifactId>org.osgi.service.servlet</artifactId>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/auth/core/AuthConstants.java b/src/main/java/org/apache/sling/auth/core/AuthConstants.java
index b0c073c..70cb5df 100644
--- a/src/main/java/org/apache/sling/auth/core/AuthConstants.java
+++ b/src/main/java/org/apache/sling/auth/core/AuthConstants.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.auth.core;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* The <code>AuthConstants</code> provides a collection of constants used to
@@ -70,9 +70,9 @@ public final class AuthConstants {
* Service Registration property which may be set by an
* {@link org.apache.sling.auth.core.spi.AuthenticationHandler} service to
* indicate whether its
- * {@link org.apache.sling.auth.core.spi.AuthenticationHandler#requestCredentials(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link org.apache.sling.auth.core.spi.AuthenticationHandler#requestCredentials(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method supports non-browser requests (according to
- * {@link AuthUtil#isBrowserRequest(javax.servlet.http.HttpServletRequest)}
+ * {@link AuthUtil#isBrowserRequest(jakarta.servlet.http.HttpServletRequest)}
* or not.
* <p>
* For backwards compatibility with existing
@@ -96,7 +96,7 @@ public final class AuthConstants {
* Marker property in the
* {@link org.apache.sling.auth.core.spi.AuthenticationInfo} object returned
* by the
- * {@link org.apache.sling.auth.core.spi.AuthenticationHandler#extractCredentials(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link org.apache.sling.auth.core.spi.AuthenticationHandler#extractCredentials(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method indicating a first authentication considered to be a login.
* <p>
* By setting this property to any non-<code>null</code> value an
diff --git a/src/main/java/org/apache/sling/auth/core/AuthUtil.java b/src/main/java/org/apache/sling/auth/core/AuthUtil.java
index c07d8ab..edb80f6 100644
--- a/src/main/java/org/apache/sling/auth/core/AuthUtil.java
+++ b/src/main/java/org/apache/sling/auth/core/AuthUtil.java
@@ -31,8 +31,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.auth.Authenticator;
import org.apache.sling.api.resource.ResourceResolver;
@@ -60,7 +60,7 @@ public final class AuthUtil {
* This header is known to be set by JQuery, ExtJS and Prototype. Other
* client-side JavaScript framework most probably also set it.
*
- * @see #isAjaxRequest(javax.servlet.http.HttpServletRequest)
+ * @see #isAjaxRequest(jakarta.servlet.http.HttpServletRequest)
*/
private static final String X_REQUESTED_WITH = "X-Requested-With";
@@ -68,7 +68,7 @@ public final class AuthUtil {
* The expected value of the {@link #X_REQUESTED_WITH} request header to
* identify a request as an Ajax request.
*
- * @see #isAjaxRequest(javax.servlet.http.HttpServletRequest)
+ * @see #isAjaxRequest(jakarta.servlet.http.HttpServletRequest)
*/
private static final String XML_HTTP_REQUEST = "XMLHttpRequest";
diff --git a/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java b/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java
index 7257110..93b0950 100644
--- a/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java
+++ b/src/main/java/org/apache/sling/auth/core/AuthenticationSupport.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.auth.core;
-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/auth/core/LoginEventDecorator.java b/src/main/java/org/apache/sling/auth/core/LoginEventDecorator.java
index 6e0c8e2..0ff6ad3 100644
--- a/src/main/java/org/apache/sling/auth/core/LoginEventDecorator.java
+++ b/src/main/java/org/apache/sling/auth/core/LoginEventDecorator.java
@@ -18,7 +18,7 @@ package org.apache.sling.auth.core;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.auth.core.spi.AuthenticationInfo;
import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java b/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java
index 33acaa0..e7329cf 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/AbstractAuthenticationHandlerHolder.java
@@ -20,8 +20,8 @@ package org.apache.sling.auth.core.impl;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler;
import org.apache.sling.auth.core.spi.AuthenticationHandler;
diff --git a/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java b/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java
index 51edb97..47efe77 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/AuthenticationHandlerHolder.java
@@ -21,8 +21,8 @@ package org.apache.sling.auth.core.impl;
import java.io.IOException;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.auth.core.AuthConstants;
import org.apache.sling.auth.core.AuthUtil;
diff --git a/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java b/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java
index 741e01e..1ab9ef8 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java
@@ -23,11 +23,11 @@ import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.request.ResponseUtil;
import org.osgi.service.component.annotations.Activate;
diff --git a/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java b/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java
index 51fca02..6dd435f 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/HttpBasicAuthenticationHandler.java
@@ -21,8 +21,8 @@ package org.apache.sling.auth.core.impl;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Base64;
import org.apache.sling.auth.core.AuthUtil;
diff --git a/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java b/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
index 175d185..f0c0570 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
@@ -20,8 +20,8 @@ package org.apache.sling.auth.core.impl;
import java.io.IOException;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+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/auth/core/impl/LogoutServlet.java b/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java
index c61c0b8..204bd66 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.auth.core.impl;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+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/auth/core/impl/PathBasedHolderCache.java b/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java
index 4e087f8..197f63e 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java
@@ -26,7 +26,7 @@ import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class PathBasedHolderCache<T extends PathBasedHolder> {
diff --git a/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java b/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
index 9736026..192a8ac 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
@@ -30,12 +30,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.auth.Authenticator;
@@ -66,10 +66,10 @@ import org.osgi.service.component.propertytypes.ServiceDescription;
import org.osgi.service.component.propertytypes.ServiceVendor;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
-import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardContextSelect;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardListener;
+import org.osgi.service.servlet.context.ServletContextHelper;
+import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardContextSelect;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardListener;
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.AttributeType;
import org.osgi.service.metatype.annotations.Designate;
diff --git a/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java b/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java
index a13b952..6372f70 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/engine/EngineAuthenticationHandlerHolder.java
@@ -21,8 +21,8 @@ package org.apache.sling.auth.core.impl.engine;
import java.io.IOException;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.auth.core.impl.AbstractAuthenticationHandlerHolder;
import org.apache.sling.auth.core.spi.AuthenticationFeedbackHandler;
diff --git a/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java b/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java
index 6680dc3..5cfe2e7 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/engine/EngineSlingAuthenticator.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.auth.core.impl.engine;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.engine.auth.Authenticator;
import org.apache.sling.engine.auth.NoAuthenticationHandlerException;
diff --git a/src/main/java/org/apache/sling/auth/core/package-info.java b/src/main/java/org/apache/sling/auth/core/package-info.java
index f8d608e..15980e8 100755
--- a/src/main/java/org/apache/sling/auth/core/package-info.java
+++ b/src/main/java/org/apache/sling/auth/core/package-info.java
@@ -22,9 +22,9 @@
* of utility functions in the {@link org.apache.sling.auth.core.AuthUtil}
* class.
*
- * @version 1.5.0
+ * @version 2.0.0
*/
-@org.osgi.annotation.versioning.Version("1.5.0")
+@org.osgi.annotation.versioning.Version("2.0.0")
package org.apache.sling.auth.core;
diff --git a/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java b/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java
index 2a14bc4..13ff175 100644
--- a/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationFormServlet.java
@@ -25,9 +25,9 @@ import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicReference;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.auth.core.AuthUtil;
diff --git a/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java b/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java
index a7635dc..8dbedfd 100644
--- a/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/AbstractAuthenticationHandler.java
@@ -21,8 +21,8 @@ package org.apache.sling.auth.core.spi;
import java.io.IOException;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.auth.core.AuthUtil;
diff --git a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java
index 13539af..e145f59 100644
--- a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationFeedbackHandler.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.auth.core.spi;
-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.ConsumerType;
diff --git a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java
index 2816110..1ab6da7 100644
--- a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationHandler.java
@@ -20,8 +20,8 @@ package org.apache.sling.auth.core.spi;
import java.io.IOException;
-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.ConsumerType;
diff --git a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java
index 3dedb3b..7f68f60 100644
--- a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfo.java
@@ -31,7 +31,7 @@ import org.apache.sling.api.resource.ResourceResolverFactory;
/**
* The <code>AuthenticationInfo</code> conveys any authentication credentials
* and/or details extracted by the
- * {@link AuthenticationHandler#extractCredentials(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link AuthenticationHandler#extractCredentials(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method from the request.
* <p>
* {@link AuthenticationHandler} implementations must return instances of this
@@ -47,7 +47,7 @@ public class AuthenticationInfo extends HashMap<String, Object> {
/**
* A special instance of this class which may be returned from the
- * {@link AuthenticationHandler#extractCredentials(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link AuthenticationHandler#extractCredentials(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method to inform the caller, that a response has been sent to the client
* to request for credentials.
* <p>
@@ -59,7 +59,7 @@ public class AuthenticationInfo extends HashMap<String, Object> {
/**
* A special instance of this class which may be returned from the
- * {@link AuthenticationHandler#extractCredentials(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link AuthenticationHandler#extractCredentials(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method to inform the caller that credential extraction failed for some
* reason.
* <p>
diff --git a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java
index 2be3d69..e22c19d 100644
--- a/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/AuthenticationInfoPostProcessor.java
@@ -16,8 +16,8 @@
*/
package org.apache.sling.auth.core.spi;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingException;
import org.apache.sling.api.resource.LoginException;
diff --git a/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java b/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java
index 6ce23c8..015b7f0 100644
--- a/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/DefaultAuthenticationFeedbackHandler.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.auth.core.spi;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.auth.core.AuthUtil;
diff --git a/src/main/java/org/apache/sling/auth/core/spi/package-info.java b/src/main/java/org/apache/sling/auth/core/spi/package-info.java
index 7171d7f..dd9e0e7 100755
--- a/src/main/java/org/apache/sling/auth/core/spi/package-info.java
+++ b/src/main/java/org/apache/sling/auth/core/spi/package-info.java
@@ -26,9 +26,9 @@
* being an abstract base implementation from which concrete
* implementations may inherit.
*
- * @version 1.2.3
+ * @version 2.0.0
*/
-@org.osgi.annotation.versioning.Version("1.2.3")
+@org.osgi.annotation.versioning.Version("2.0.0")
package org.apache.sling.auth.core.spi;
diff --git a/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java b/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java
index d3da576..fe47edf 100644
--- a/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java
+++ b/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java
@@ -20,8 +20,8 @@ package org.apache.sling.engine.auth;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* The <code>AuthenticationHandler</code> interface defines the service API used
diff --git a/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java b/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java
index 3e33733..96d9e6e 100644
--- a/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java
+++ b/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java
@@ -22,7 +22,7 @@ import javax.jcr.Credentials;
/**
* The <code>AuthenticationInfo</code> defines the data returned from the
- * {@link AuthenticationHandler#authenticate(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link AuthenticationHandler#authenticate(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method.
*
* @deprecated see {@link AuthenticationHandler}
@@ -32,7 +32,7 @@ public class AuthenticationInfo {
/**
* This object is returned by the
- * {@link AuthenticationHandler#authenticate(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+ * {@link AuthenticationHandler#authenticate(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
* method to indicate an ongoing authentication transaction.
*/
public static final AuthenticationInfo DOING_AUTH = new AuthenticationInfo();
diff --git a/src/main/java/org/apache/sling/engine/auth/Authenticator.java b/src/main/java/org/apache/sling/engine/auth/Authenticator.java
index 81e6c75..c03c595 100644
--- a/src/main/java/org/apache/sling/engine/auth/Authenticator.java
+++ b/src/main/java/org/apache/sling/engine/auth/Authenticator.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.engine.auth;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* The <code>Authenticator</code> interface defines the service interface of the
diff --git a/src/main/java/org/apache/sling/engine/auth/package-info.java b/src/main/java/org/apache/sling/engine/auth/package-info.java
index 22743cf..5c263d8 100755
--- a/src/main/java/org/apache/sling/engine/auth/package-info.java
+++ b/src/main/java/org/apache/sling/engine/auth/package-info.java
@@ -26,9 +26,9 @@
* the new {@link org.apache.sling.auth.core.spi.AuthenticationHandler}
* interface.
*
- * @version 2.0.6
+ * @version 3.0.0
*/
-@org.osgi.annotation.versioning.Version("2.0.6")
+@org.osgi.annotation.versioning.Version("3.0.0")
package org.apache.sling.engine.auth;
diff --git a/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java b/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java
index 839c4a7..dd2b615 100644
--- a/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java
+++ b/src/test/java/org/apache/sling/auth/core/AuthUtilTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.auth.core;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.resource.NonExistingResource;
import org.apache.sling.api.resource.ResourceResolver;
diff --git a/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorOsgiTest.java b/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorOsgiTest.java
index 9670f05..29314e7 100644
--- a/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorOsgiTest.java
+++ b/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorOsgiTest.java
@@ -39,8 +39,8 @@ import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Supplier;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolver;
diff --git a/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java b/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java
index bb1871b..7873a57 100644
--- a/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java
+++ b/src/test/java/org/apache/sling/auth/core/impl/SlingAuthenticatorTest.java
@@ -26,11 +26,11 @@ import static org.mockito.Mockito.never;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;