This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9e029254f1cb2cca54db43b82a7eec378dff9142 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri May 24 15:12:18 2024 +0100 Update to Jakarta Authentication API 3.1. --- build.xml | 2 +- .../auth/message/config/AuthConfigFactory.java | 25 ---------------------- webapps/docs/changelog.xml | 3 +++ webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/config/jaspic.xml | 4 ++-- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/build.xml b/build.xml index 277c0873c8..052d6e9afb 100644 --- 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 index 0fecabc248..2229eb66b8 100644 --- a/java/jakarta/security/auth/message/config/AuthConfigFactory.java +++ b/java/jakarta/security/auth/message/config/AuthConfigFactory.java @@ -17,7 +17,6 @@ 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; @@ -25,30 +24,6 @@ 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 index 202dda7b4c..78e8bacf37 100644 --- 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 index abc5bb80b9..efefcdc20b 100644 --- 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> — Optional. Tomcat Jasper JSP Compiler and Runtime.</li> <li><em>jasper-el.jar</em> — Optional. Tomcat EL implementation.</li> - <li><em>jaspic-api.jar</em> — Jakarta Authentication 3.0 API.</li> + <li><em>jaspic-api.jar</em> — Jakarta Authentication 3.1 API.</li> <li><em>jsp-api.jar</em> — Optional. Jakarta Pages 4.0 API.</li> <li><em>servlet-api.jar</em> — Jakarta Servlet 6.1 API.</li> <li><em>tomcat-api.jar</em> — Several interfaces defined by Tomcat. diff --git a/webapps/docs/config/jaspic.xml b/webapps/docs/config/jaspic.xml index 546918ab4a..b6c5d8197b 100644 --- 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> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org