Merge pull request #24945 from arjantijms/8.0

Integrate Epicyro 3.1.0
eclipse-ee4j · May 6, 2024 · 9d54a4c · 9d54a4c
2 parents 9b7b526 + 0fb291a
commit 9d54a4c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -99,11 +99,11 @@
         <!-- APIs -->
         <jakarta.security-api.version>4.0.0-M2</jakarta.security-api.version>
         <jakarta.authorization-api.version>3.0.0</jakarta.authorization-api.version>
-        <jakarta.authentication-api.version>3.1.0-M1</jakarta.authentication-api.version>
+        <jakarta.authentication-api.version>3.1.0</jakarta.authentication-api.version>
         <!-- Implementations -->
         <soteria.version>4.0.0-M3</soteria.version>
         <exousia.version>3.0.0-M3</exousia.version>
-        <epicyro.version>3.1.0-M2</epicyro.version>
+        <epicyro.version>3.1.0</epicyro.version>
         <!-- Dependencies -->
         <nimbus.version>9.38-rc3</nimbus.version>
         <jcip.version>1.0.2</jcip.version>

diff --git a/...rity/src/main/java/com/sun/enterprise/security/webservices/SoapAuthenticationService.java b/...rity/src/main/java/com/sun/enterprise/security/webservices/SoapAuthenticationService.java
@@ -29,25 +29,6 @@
 import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL;
 import static jakarta.xml.ws.handler.MessageContext.SERVLET_REQUEST;
 
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Map;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-
-import org.glassfish.api.invocation.ComponentInvocation;
-import org.glassfish.api.invocation.InvocationManager;
-import org.glassfish.deployment.common.ModuleDescriptor;
-import org.glassfish.epicyro.config.module.configprovider.GFServerConfigProvider;
-import org.glassfish.epicyro.services.BaseAuthenticationService;
-import org.glassfish.internal.api.Globals;
-
 import com.sun.enterprise.deployment.Application;
 import com.sun.enterprise.deployment.BundleDescriptor;
 import com.sun.enterprise.deployment.EjbDescriptor;
@@ -90,6 +71,22 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.xml.bind.UnmarshalException;
 import jakarta.xml.ws.WebServiceException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import org.glassfish.api.invocation.ComponentInvocation;
+import org.glassfish.api.invocation.InvocationManager;
+import org.glassfish.deployment.common.ModuleDescriptor;
+import org.glassfish.epicyro.config.module.configprovider.GFServerConfigProvider;
+import org.glassfish.epicyro.services.BaseAuthenticationService;
+import org.glassfish.internal.api.Globals;
 
 public class SoapAuthenticationService extends BaseAuthenticationService {