From b4031507691c919a647832db84b3ccf207e8d9d7 Mon Sep 17 00:00:00 2001
From: Jerome Van Der Linden <jeromevdl@gmail.com>
Date: Thu, 22 Jun 2023 09:37:31 +0200
Subject: [PATCH] removing logback enough log frameworks (slf4j / log4j), we'll
 remove log4j in v2 and only use slf4j (also for tests: slf4j-simple)

---
 pom.xml                                       |  6 ------
 powertools-cloudformation/pom.xml             |  5 -----
 .../src/test/resources/logback.xml            | 11 ----------
 powertools-e2e-tests/pom.xml                  |  7 +++----
 .../src/test/resources/log4j2.xml             | 16 +++++++++++++++
 .../src/test/resources/logback-test.xml       | 20 -------------------
 6 files changed, 19 insertions(+), 46 deletions(-)
 delete mode 100644 powertools-cloudformation/src/test/resources/logback.xml
 create mode 100644 powertools-e2e-tests/src/test/resources/log4j2.xml
 delete mode 100644 powertools-e2e-tests/src/test/resources/logback-test.xml

diff --git a/pom.xml b/pom.xml
index dd2ba70ac..2bd0c21a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,12 +293,6 @@
                 <version>1.1.1</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>1.3.8</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
                 <artifactId>wiremock-jre8</artifactId>
diff --git a/powertools-cloudformation/pom.xml b/powertools-cloudformation/pom.xml
index 2d8b8d489..d404df42d 100644
--- a/powertools-cloudformation/pom.xml
+++ b/powertools-cloudformation/pom.xml
@@ -98,11 +98,6 @@
             <artifactId>wiremock-jre8</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/powertools-cloudformation/src/test/resources/logback.xml b/powertools-cloudformation/src/test/resources/logback.xml
deleted file mode 100644
index 8c752522e..000000000
--- a/powertools-cloudformation/src/test/resources/logback.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <logger name="software.amazon.lambda.powertools" level="DEBUG" />
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/powertools-e2e-tests/pom.xml b/powertools-e2e-tests/pom.xml
index e497f568f..dfb718618 100644
--- a/powertools-e2e-tests/pom.xml
+++ b/powertools-e2e-tests/pom.xml
@@ -24,12 +24,11 @@
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
-
     <dependencies>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.3.8</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/powertools-e2e-tests/src/test/resources/log4j2.xml b/powertools-e2e-tests/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..12bd0b59d
--- /dev/null
+++ b/powertools-e2e-tests/src/test/resources/log4j2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" />
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="software.amazon.lambda.powertools" level="debug" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Root level="info">
+            <AppenderRef ref="Console" />
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/powertools-e2e-tests/src/test/resources/logback-test.xml b/powertools-e2e-tests/src/test/resources/logback-test.xml
deleted file mode 100644
index aac638007..000000000
--- a/powertools-e2e-tests/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration>
-
-<configuration>
-    <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
-    <import class="ch.qos.logback.core.ConsoleAppender"/>
-
-    <appender name="STDOUT" class="ConsoleAppender">
-        <encoder class="PatternLayoutEncoder">
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="software.amazon.lambda.powertools" level="DEBUG"/>
-
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>
\ No newline at end of file