From 58619c67d852d6b529598252e1a28582dd8a8f17 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Mon, 27 Dec 2021 01:46:02 +0100
Subject: [PATCH] Migrate from Log4j 1.2.x to Logback

---
 cli/pom.xml                                           |  4 ++--
 .../java/org/openapitools/openapidiff/cli/Main.java   |  7 ++++---
 cli/src/main/resources/log4j.properties               |  5 -----
 cli/src/main/resources/logback.xml                    | 11 +++++++++++
 pom.xml                                               |  6 +++---
 5 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 cli/src/main/resources/log4j.properties
 create mode 100644 cli/src/main/resources/logback.xml

diff --git a/cli/pom.xml b/cli/pom.xml
index 66c18fb2..b67f7336 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -31,8 +31,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
         </dependency>
     </dependencies>
     <build>
diff --git a/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java b/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java
index 8da0fea1..8fb2ff00 100644
--- a/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java
+++ b/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java
@@ -1,5 +1,6 @@
 package org.openapitools.openapidiff.cli;
 
+import ch.qos.logback.classic.Level;
 import io.swagger.v3.parser.core.models.AuthorizationValue;
 import java.io.File;
 import java.io.IOException;
@@ -15,8 +16,6 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
 import org.openapitools.openapidiff.core.OpenApiCompare;
 import org.openapitools.openapidiff.core.model.ChangedOpenApi;
 import org.openapitools.openapidiff.core.output.ConsoleRender;
@@ -157,7 +156,9 @@ public static void main(String... args) {
       if (line.hasOption("state")) {
         logLevel = "OFF";
       }
-      LogManager.getRootLogger().setLevel(Level.toLevel(logLevel));
+      ch.qos.logback.classic.Logger root =
+          (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+      root.setLevel(Level.toLevel(logLevel));
 
       if (line.getArgList().size() < 2) {
         throw new ParseException("Missing arguments");
diff --git a/cli/src/main/resources/log4j.properties b/cli/src/main/resources/log4j.properties
deleted file mode 100644
index 1f7d27e3..00000000
--- a/cli/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootLogger=DEBUG, STDOUT
-log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
-log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
-log4j.appender.STDOUT.layout.ConversionPattern=%-5p [%c] - %m%n
-#log4j.appender.STDOUT.layout.ConversionPattern=%d{yyyy-MM-dd'T'HH:mm:ss.SSS} %-5p [%c] - %m%n
\ No newline at end of file
diff --git a/cli/src/main/resources/logback.xml b/cli/src/main/resources/logback.xml
new file mode 100644
index 00000000..018a4277
--- /dev/null
+++ b/cli/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>[%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="debug">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 06f6bfd4..127d7770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,9 +142,9 @@
                 <version>${slf4j.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j.version}</version>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.10</version>
             </dependency>
             <dependency>
                 <groupId>commons-httpclient</groupId>