Merge pull request #6269 from darranl/WFCORE-7071-WFCORE-7072

[WFCORE-7071] / [WFCORE-7072] Elytron EE 3.1.1.Final and use the new PolicyUtil to manage the java.security.Policy object
wildfly · Dec 5, 2024 · 50f662c · 50f662c
2 parents 7a5b3e3 + 5748a94
commit 50f662c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/PolicyDefinitions.java b/elytron/src/main/java/org/wildfly/extension/elytron/PolicyDefinitions.java
@@ -65,6 +65,7 @@
 import org.wildfly.security.authz.jacc.DelegatingPolicyContextHandler;
 import org.wildfly.security.authz.jacc.ElytronPolicyConfigurationFactory;
 import org.wildfly.security.authz.jacc.JaccDelegatingPolicy;
+import org.wildfly.security.authz.jacc.PolicyUtil;
 import org.wildfly.security.manager.WildFlySecurityManager;
 
 /**
@@ -212,7 +213,7 @@ private void setPolicy(Policy policy) {
 
                     private PrivilegedAction<Void> setPolicyAction(Policy policy) {
                         return () -> {
-                            Policy.setPolicy(policy);
+                            PolicyUtil.setPolicy(policy);
                             return null;
                         };
                     }
@@ -226,7 +227,7 @@ private Policy getPolicy() {
                     }
 
                     private PrivilegedAction<Policy> getPolicyAction() {
-                        return Policy::getPolicy;
+                        return PolicyUtil::getPolicy;
                     }
                 };
             }

diff --git a/pom.xml b/pom.xml
@@ -251,7 +251,7 @@
         <version.org.wildfly.openssl.wildfly-openssl-windows-x86_64>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-windows-x86_64>
         <version.org.wildfly.security.elytron>2.6.0.Final</version.org.wildfly.security.elytron>
         <version.org.wildfly.security.elytron-web>4.1.0.Final</version.org.wildfly.security.elytron-web>
-        <version.org.wildfly.security.jakarta.elytron-ee>3.0.3.Final</version.org.wildfly.security.jakarta.elytron-ee>
+        <version.org.wildfly.security.jakarta.elytron-ee>3.1.1.Final</version.org.wildfly.security.jakarta.elytron-ee>
         <version.org.wildfly.unstable.api.annotation>1.0.0.Final</version.org.wildfly.unstable.api.annotation>
         <version.org.yaml.snakeyaml>2.3</version.org.yaml.snakeyaml>
     </properties>