Update to Jakarta Authentication API 3.1.

apache · May 24, 2024 · 9e02925 · 9e02925
1 parent 980b4a2
commit 9e02925
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 29 deletions.
diff --git a/build.xml b/build.xml
@@ -66,7 +66,7 @@
   <property name="websocket.spec.version"  value="2.2" />
   <property name="websocket.revision"      value="" />
   <property name="jaspic.spec.version"     value="3.1" />
-  <property name="jaspic.revision"         value="-SNAPSHOT" />
+  <property name="jaspic.revision"         value="" />
   <property name="annotation.spec.version" value="3.0" />
   <property name="annotation.revision"     value="" />
 

diff --git a/java/jakarta/security/auth/message/config/AuthConfigFactory.java b/java/jakarta/security/auth/message/config/AuthConfigFactory.java
@@ -17,38 +17,13 @@
 package jakarta.security.auth.message.config;
 
 import java.security.Security;
-import java.security.SecurityPermission;
 import java.util.Map;
 
 import jakarta.security.auth.message.module.ServerAuthModule;
 
 public abstract class AuthConfigFactory {
 
     public static final String DEFAULT_FACTORY_SECURITY_PROPERTY = "authconfigprovider.factory";
-    public static final String GET_FACTORY_PERMISSION_NAME = "getProperty.authconfigprovider.factory";
-    public static final String SET_FACTORY_PERMISSION_NAME = "setProperty.authconfigprovider.factory";
-    public static final String PROVIDER_REGISTRATION_PERMISSION_NAME = "setProperty.authconfigfactory.provider";
-
-    /**
-     * @deprecated Following JEP 411
-     */
-    @Deprecated(forRemoval = true)
-    public static final SecurityPermission getFactorySecurityPermission =
-            new SecurityPermission(GET_FACTORY_PERMISSION_NAME);
-
-    /**
-     * @deprecated Following JEP 411
-     */
-    @Deprecated(forRemoval = true)
-    public static final SecurityPermission setFactorySecurityPermission =
-            new SecurityPermission(SET_FACTORY_PERMISSION_NAME);
-
-    /**
-     * @deprecated Following JEP 411
-     */
-    @Deprecated(forRemoval = true)
-    public static final SecurityPermission providerRegistrationSecurityPermission =
-            new SecurityPermission(PROVIDER_REGISTRATION_PERMISSION_NAME);
 
     private static final String DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL =
             "org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl";

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -140,6 +140,9 @@
       <update>
         Update to Jakarta Annotations API 3.0. (markt)
       </update>
+      <update>
+        Update to Jakarta Authentication API 3.1. (markt)
+      </update>
     </changelog>
   </subsection>
 </section>

diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
@@ -152,7 +152,7 @@ loaders as it is initialized:</p>
     <li><em>jasper.jar</em> &#8212; Optional. Tomcat Jasper JSP Compiler and
         Runtime.</li>
     <li><em>jasper-el.jar</em> &#8212; Optional. Tomcat EL implementation.</li>
-    <li><em>jaspic-api.jar</em> &#8212; Jakarta Authentication 3.0 API.</li>
+    <li><em>jaspic-api.jar</em> &#8212; Jakarta Authentication 3.1 API.</li>
     <li><em>jsp-api.jar</em> &#8212; Optional. Jakarta Pages 4.0 API.</li>
     <li><em>servlet-api.jar</em> &#8212; Jakarta Servlet 6.1 API.</li>
     <li><em>tomcat-api.jar</em> &#8212; Several interfaces defined by Tomcat.

diff --git a/webapps/docs/config/jaspic.xml b/webapps/docs/config/jaspic.xml
@@ -35,8 +35,8 @@
 <section name="Introduction">
 
   <p>Tomcat implements <a
-  href="https://jakarta.ee/specifications/authentication/3.0/">Jakarta
-  Authentication 3.0</a>. The implementation is primarily intended to enable the
+  href="https://jakarta.ee/specifications/authentication/3.1/">Jakarta
+  Authentication 3.1</a>. The implementation is primarily intended to enable the
   integration of 3rd party authentication implementations with Tomcat.</p>
 
   <p>Jakarta Authentication may be configured in one of two ways:</p>