From 81ede1181f33e58e51c68d77446dacbcb849b475 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Sat, 19 Aug 2023 11:51:58 +1000
Subject: [PATCH] WW-5334 Lift log4j dependencies

---
 apps/rest-showcase/pom.xml |  2 --
 apps/showcase/pom.xml      |  4 ----
 core/pom.xml               |  1 -
 plugins/cdi/pom.xml        |  7 -------
 plugins/osgi/pom.xml       |  8 --------
 plugins/pom.xml            |  6 ++++++
 plugins/portlet/pom.xml    |  7 -------
 pom.xml                    | 11 ++++++++++-
 8 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 17f9c4a19..6dcd20c3e 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -56,12 +56,10 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
 
         <dependency>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 1a04728ce..18bd205ee 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -108,22 +108,18 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j2.version}</version>
         </dependency>
 
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 59f0d43fd..3a10ed47d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -260,7 +260,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index e1cc10d10..9b5096f60 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -58,13 +58,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 67cff3644..b4ed50ab1 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -105,14 +105,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
     <properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c8f62b838..267985dbe 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -82,6 +82,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 70560063a..37cca9c09 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -100,13 +100,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- Mocks for unit testing (by Spring) -->
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/pom.xml b/pom.xml
index 76e4d86ee..e650eb27f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1026,12 +1026,21 @@
                 <artifactId>log4j-api</artifactId>
                 <version>${log4j2.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-jcl</artifactId>
                 <version>${log4j2.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.testng</groupId>