#156 Update to Jakarta dependencies

api/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>4.0.3</version>
+            <version>5.0.0-M1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
-            <version>3.0.3</version>
+            <version>4.0.0-RC1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -101,13 +101,13 @@
         <dependency>
             <groupId>jakarta.security.auth.message</groupId>
             <artifactId>jakarta.security.auth.message-api</artifactId>
-            <version>1.1.3</version>
+            <version>2.0.0-RC1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.authorization</groupId>
             <artifactId>jakarta.authorization-api</artifactId>
-            <version>1.5.0</version>
+            <version>2.0.0-RC1</version>
             <scope>provided</scope>
         </dependency>
 

api/src/main/java/jakarta/security/enterprise/AuthenticationStatus.java

@@ -16,7 +16,7 @@
 
 package jakarta.security.enterprise;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
 
@@ -26,7 +26,7 @@
  * of the authentication process.
  * 
  * <p>
- * For the result from {@link HttpAuthenticationMechanism#validateRequest(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, jakarta.security.enterprise.authentication.mechanism.http.HttpMessageContext)} 
+ * For the result from {@link HttpAuthenticationMechanism#validateRequest(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.security.enterprise.authentication.mechanism.http.HttpMessageContext)} 
  * an AuthenticationStatus must be transformed by the Jakarta EE server into the corresponding Jakarta Authentication <code>AuthStatus</code>
  * according to the following rules:
  * 
@@ -50,10 +50,10 @@
  * otherwise not.
  * 
  * <p>
- * The return value of {@link SecurityContext#authenticate(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters)}
+ * The return value of {@link SecurityContext#authenticate(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters)}
  * , which is also of type AuthenticationStatus, strongly relates to the outcome of the <code>HttpAuthenticationMechanism#validateRequest</code>
  * method as described above, but must be transformed by the Jakarta EE server from the corresponding outcome of the
- * {@link HttpServletRequest#authenticate(javax.servlet.http.HttpServletResponse)} call as follows:
+ * {@link HttpServletRequest#authenticate(jakarta.servlet.http.HttpServletResponse)} call as follows:
  * 
  * <ul>
  *   <li> <code>true</code> to <code>AuthenticationStatus.SUCCESS</code> </li>

api/src/main/java/jakarta/security/enterprise/SecurityContext.java

@@ -20,8 +20,8 @@
 import java.util.Set;
 
 import javax.ejb.SessionContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters;
 import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
@@ -97,7 +97,7 @@ public interface SecurityContext {
      *
      * @param resource the name of the web resource to test access for. This is a <code>URLPatternSpec</code> that
      * identifies the application specific web resources to which the permission pertains. For a full specification of this
-     * pattern see {@link javax.security.jacc.WebResourcePermission#WebResourcePermission(String, String)}.
+     * pattern see {@link jakarta.security.jacc.WebResourcePermission#WebResourcePermission(String, String)}.
      * @param methods one or more methods to check for whether the caller has access to the web resource using one of those methods.
      *
      * @return <code>true</code> if the caller has access to the web resource using one of the given methods, <code>false</code> otherwise.

api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/AutoApplySession.java

@@ -27,11 +27,11 @@
 
 /**
  * The AutoApplySession annotation provides an application the ability to declaratively designate
- * that an authentication mechanism uses the <code>javax.servlet.http.registerSession</code>
+ * that an authentication mechanism uses the <code>jakarta.servlet.http.registerSession</code>
  * and auto applies this for every request.
  *
  * <p>
- * See the Jakarta Authentication spec for further details on <code>javax.servlet.http.registerSession</code>.
+ * See the Jakarta Authentication spec for further details on <code>jakarta.servlet.http.registerSession</code>.
  *
  * <p>
  * This support is provided via an implementation of a Jakarta Interceptors interceptor that conducts the

api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/CustomFormAuthenticationMechanismDefinition.java

@@ -32,7 +32,7 @@
  * <p> 
  * Instead of posting back to a predefined action to continue the authentication dialog 
  * (Servlet spec 13.6.3 step 3), this variant depends on the application calling 
- * {@link SecurityContext#authenticate(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters)}
+ * {@link SecurityContext#authenticate(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters)}
  * 
  */
 @Retention(RUNTIME)

api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/HttpAuthenticationMechanism.java

@@ -18,11 +18,11 @@
 
 import static jakarta.security.enterprise.AuthenticationStatus.SUCCESS;
 
-import javax.security.auth.message.module.ServerAuthModule;
-import javax.servlet.Filter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.security.auth.message.module.ServerAuthModule;
+import jakarta.servlet.Filter;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import jakarta.security.enterprise.AuthenticationException;
 import jakarta.security.enterprise.AuthenticationStatus;

api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/HttpMessageContext.java

@@ -21,16 +21,16 @@
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.MessageInfo;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.security.auth.message.MessageInfo;
 import jakarta.security.enterprise.AuthenticationStatus;
 import jakarta.security.enterprise.CallerPrincipal;
 import jakarta.security.enterprise.SecurityContext;
 import jakarta.security.enterprise.identitystore.CredentialValidationResult;
 import jakarta.security.enterprise.identitystore.CredentialValidationResult.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * <code>HttpMessageContext</code> contains all of the per-request state information and encapsulates the client request, 
@@ -190,7 +190,7 @@ public interface HttpMessageContext {
      * 
      * @return {@link AuthenticationStatus#SEND_CONTINUE}
      * 
-     * @see RequestDispatcher#forward(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
+     * @see RequestDispatcher#forward(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse)
      */
     AuthenticationStatus forward(String path);
 

api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/HttpMessageContextWrapper.java

@@ -21,12 +21,12 @@
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.MessageInfo;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.security.auth.message.MessageInfo;
 import jakarta.security.enterprise.AuthenticationStatus;
 import jakarta.security.enterprise.identitystore.CredentialValidationResult;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * This class is an implementation of the HttpMessageContext interface that

api/src/main/java/jakarta/security/enterprise/authentication/mechanism/http/RememberMe.java

@@ -24,13 +24,13 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.el.ELProcessor;
 import javax.enterprise.util.Nonbinding;
 import javax.interceptor.InterceptorBinding;
-import javax.servlet.http.Cookie;
 
+import jakarta.el.ELProcessor;
 import jakarta.security.enterprise.identitystore.IdentityStore;
 import jakarta.security.enterprise.identitystore.RememberMeIdentityStore;
+import jakarta.servlet.http.Cookie;
 
 /**
  * The RememberMe annotation provides an application the ability to declaratively designate

api/src/main/java/jakarta/security/enterprise/identitystore/IdentityStore.java

@@ -26,7 +26,7 @@
 import java.util.EnumSet;
 import java.util.Set;
 
-import javax.security.auth.message.module.ServerAuthModule;
+import jakarta.security.auth.message.module.ServerAuthModule;
 
 import jakarta.security.enterprise.CallerPrincipal;
 import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;

api/src/main/java/jakarta/security/enterprise/identitystore/IdentityStoreHandler.java

@@ -16,7 +16,7 @@
 
 package jakarta.security.enterprise.identitystore;
 
-import javax.security.auth.message.module.ServerAuthModule;
+import jakarta.security.auth.message.module.ServerAuthModule;
 
 import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
 import jakarta.security.enterprise.credential.Credential;

api/src/main/java/jakarta/security/enterprise/identitystore/RememberMeIdentityStore.java

@@ -18,7 +18,7 @@
 
 import java.util.Set;
 
-import javax.security.auth.message.module.ServerAuthModule;
+import jakarta.security.auth.message.module.ServerAuthModule;
 
 import jakarta.security.enterprise.CallerPrincipal;
 import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;

api/src/main/java/jakarta/security/enterprise/package-info.java

@@ -75,4 +75,4 @@
  */
 package jakarta.security.enterprise;
 
-import javax.el.ELProcessor;
+import jakarta.el.ELProcessor;

pom.xml

@@ -35,12 +35,6 @@
     </scm>
 
     <properties>
-        <non_final>false</non_final>
-        <extension.name>javax.security.enterprise</extension.name>
-        <spec.version>1.0</spec.version>
-
-        <packages.export>javax.security.enterprise.*</packages.export>
-
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>