From 625aa11324344d59f90273d21616588901fcaa69 Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Mon, 12 Aug 2024 16:07:11 -0700
Subject: [PATCH] [WFCORE-6745] Upgrade log4j2 to 2.23.1 and
 log4j2-jboss-logmanager to 2.0.1.Final.

https://issues.redhat.com/browse/WFCORE-6745
Signed-off-by: James R. Perkins <jperkins@redhat.com>
---
 pom.xml                                                     | 6 +++---
 .../manualmode/logging/LoggingDependenciesTestCase.java     | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5349ef060e7..1842044ee93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@
         <version.org.apache.kerby>2.0.3</version.org.apache.kerby>
         <version.org.apache.httpcomponents.httpclient>4.5.14</version.org.apache.httpcomponents.httpclient>
         <version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>
-        <version.org.apache.logging.log4j>2.22.1</version.org.apache.logging.log4j>
+        <version.org.apache.logging.log4j>2.23.1</version.org.apache.logging.log4j>
         <version.org.apache.maven.provider>3.5.4</version.org.apache.maven.provider>
         <version.org.apache.maven.resolver>1.1.1</version.org.apache.maven.resolver>
         <version.org.apache.sshd>2.13.2</version.org.apache.sshd>
@@ -216,7 +216,7 @@
         <version.org.jboss.logging.jboss-logging-tools>2.2.1.Final</version.org.jboss.logging.jboss-logging-tools>
         <version.org.jboss.logging.jul-to-slf4j-stub>1.0.1.Final</version.org.jboss.logging.jul-to-slf4j-stub>
         <version.org.jboss.logmanager.jboss-logmanager>2.1.19.Final</version.org.jboss.logmanager.jboss-logmanager>
-        <version.org.jboss.logmanager.log4j2-jboss-logmanager>1.1.2.Final</version.org.jboss.logmanager.log4j2-jboss-logmanager>
+        <version.org.jboss.logmanager.log4j2-jboss-logmanager>2.0.1.Final</version.org.jboss.logmanager.log4j2-jboss-logmanager>
         <version.org.jboss.marshalling.jboss-marshalling>2.1.4.SP1</version.org.jboss.marshalling.jboss-marshalling>
         <version.org.jboss.modules.jboss-modules>2.1.5.Final</version.org.jboss.modules.jboss-modules>
         <version.org.jboss.msc.jboss-msc>1.5.5.Final</version.org.jboss.msc.jboss-msc>
@@ -2454,4 +2454,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/LoggingDependenciesTestCase.java b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/LoggingDependenciesTestCase.java
index dfd839300f0..fa912f3d16a 100644
--- a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/LoggingDependenciesTestCase.java
+++ b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/LoggingDependenciesTestCase.java
@@ -6,6 +6,7 @@
 package org.jboss.as.test.manualmode.logging;
 
 import java.util.List;
+import java.util.PropertyPermission;
 
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.client.helpers.Operations;
@@ -65,7 +66,10 @@ public void disableLoggingDependencies() throws Exception {
         addPermissions(archive,
                 new RuntimePermission("getClassLoader"),
                 new RuntimePermission("accessDeclaredMembers"),
-                new RuntimePermission("getenv.*")
+                new RuntimePermission("getenv.*"),
+                // Required for log4j2 as it uses System.getProperties() during initialization which requires both
+                // read and write permissions for all properties.
+                new PropertyPermission("*", "read,write")
         );
         // Ensure the log4j deployment can be deployed
         deploy(archive);