From 0ccd33b1614d9c53a3c554286c2a2ddc7dfa9680 Mon Sep 17 00:00:00 2001
From: Darran A Lofthouse <darran.lofthouse@jboss.com>
Date: Mon, 25 Nov 2024 19:10:35 +0000
Subject: [PATCH 1/2] [WFCORE-7071] Upgrade Elytron EE to 3.1.1.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1f5e2289983..dd6cc55501d 100644
--- 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>

From 5748a9496747e5b17447712609ba48aa4d1ac477 Mon Sep 17 00:00:00 2001
From: Darran A Lofthouse <darran.lofthouse@jboss.com>
Date: Tue, 26 Nov 2024 11:51:39 +0000
Subject: [PATCH 2/2] [WFCORE-7072] Use new PolicyUtil SPI to set and get the
 Policy instance.

---
 .../org/wildfly/extension/elytron/PolicyDefinitions.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 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
index 2a3f2ff8013..3cb99e8e33f 100644
--- 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;
                     }
                 };
             }