From 954da43058f0ed782cfd523e4ec8bd469b9c6c17 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 3 Jan 2022 14:04:29 -0500
Subject: [PATCH] Upgrade to log4j2 2.17.1

Add explicit dependencies on log4j-core and log4j-api to override
derived version and force 2.17.1

Issue-ID: CCSDK-3556
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I9e8ebbaaaccad59735236810ad25c9b50ef84322
---
 .../spring-boot-setup/src/main/resources/pom-template.xml      | 10 ++++++++++
 springboot/springboot1/pom.xml                                 | 10 ++++++++++
 springboot/springboot2/pom.xml                                 | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index efa15a33..4df81dbf 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -203,6 +203,16 @@
                 <artifactId>liquibase-core</artifactId>
                 <version>4.4.2-nordix</version>
             </dependency>   
+            <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>
         </dependencies>
     </dependencyManagement>
 
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index e04483ff..832c46cb 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -203,6 +203,16 @@
                 <artifactId>liquibase-core</artifactId>
                 <version>4.4.2-nordix</version>
             </dependency>   
+            <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>
         </dependencies>
     </dependencyManagement>
 
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 644055ec..253ebe20 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -203,6 +203,16 @@
                 <artifactId>liquibase-core</artifactId>
                 <version>4.4.2-nordix</version>
             </dependency>   
+            <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>
         </dependencies>
     </dependencyManagement>
 
-- 
2.16.6