Merge pull request #632 from baulea/upgrade_logback

upgrade logback from 1.0.7 to 1.3.14 and slf4j to 2.0.12
authorjapps · Mar 10, 2024 · f4cf96e · f4cf96e
2 parents c43442a + b693f0c
commit f4cf96e
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 28 deletions.
diff --git a/core/src/main/resources/logback.xml b/core/src/main/resources/logback.xml
@@ -9,12 +9,10 @@
 	</appender>
 
 	<appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-		<!--<encoder>
-			<pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
-		</encoder>-->
-		<layout class="ch.qos.logback.classic.PatternLayout">
+		<encoder>
+			<!--<pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>-->
 			<pattern>%d %green([%thread]) %highlight(%level) %logger{100} - %blue(%msg%n)</pattern>
-		</layout>
+		</encoder>
 	</appender>
 
 	<root level="INFO">

diff --git a/http-testing/src/main/resources/logback.xml b/http-testing/src/main/resources/logback.xml
@@ -9,13 +9,11 @@
     </appender>
 
     <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-        <!--<encoder>
-            <pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
-        </encoder>-->
-        <layout class="ch.qos.logback.classic.PatternLayout">
+        <encoder>
+            <!--<pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>-->
             <!--<pattern>%d %green([%thread]) %highlight(%level) %logger{100} - %blue(%msg%n)</pattern>-->
             <pattern>%d [%thread] %-5level %logger{100} - %msg%n</pattern>
-        </layout>
+        </encoder>
     </appender>
 
     <root level="INFO">

diff --git a/http-testing/src/test/resources/logback.xml b/http-testing/src/test/resources/logback.xml
@@ -9,13 +9,11 @@
     </appender>
 
     <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-        <!--<encoder>
-            <pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
-        </encoder>-->
-        <layout class="ch.qos.logback.classic.PatternLayout">
+        <encoder>
+            <!--<pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>-->
             <!--<pattern>%d %green([%thread]) %highlight(%level) %logger{100} - %blue(%msg%n)</pattern>-->
             <pattern>%d [%thread] %-5level %logger{100} - %msg%n</pattern>
-        </layout>
+        </encoder>
     </appender>
 
     <root level="WARN"> <!-- Update this value to see or prevent verbose outputs -->

diff --git a/junit5-testing/src/main/resources/logback.xml b/junit5-testing/src/main/resources/logback.xml
@@ -9,13 +9,11 @@
     </appender>
 
     <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-        <!--<encoder>
-            <pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
-        </encoder>-->
-        <layout class="ch.qos.logback.classic.PatternLayout">
+        <encoder class="ch.qos.logback.classic.PatternLayout">
+            <!--<pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>-->
             <!--<pattern>%d %green([%thread]) %highlight(%level) %logger{100} - %blue(%msg%n)</pattern>-->
             <pattern>%d [%thread] %-5level %logger{100} - %msg%n</pattern>
-        </layout>
+        </encoder>
     </appender>
 
     <root level="INFO">

diff --git a/kafka-testing/src/main/resources/logback.xml b/kafka-testing/src/main/resources/logback.xml
@@ -9,13 +9,11 @@
     </appender>
 
     <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-        <!--<encoder>
-            <pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
-        </encoder>-->
-        <layout class="ch.qos.logback.classic.PatternLayout">
+        <encoder>
+            <!--<pattern>%d [%thread] %-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>-->
             <!--<pattern>%d %green([%thread]) %highlight(%level) %logger{100} - %blue(%msg%n)</pattern>-->
             <pattern>%d [%thread] %-5level %logger{100} - %msg%n</pattern>
-        </layout>
+        </encoder>
     </appender>
 
     <root level="INFO">

diff --git a/kafka-testing/src/test/resources/logback.xml b/kafka-testing/src/test/resources/logback.xml
@@ -10,9 +10,9 @@
     </appender>
 
     <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
+        <encoder>
             <pattern>%d [%thread] %-5level %logger{30} - %msg%n</pattern>
-        </layout>
+        </encoder>
     </appender>
 
     <!-- Update level to DEBUG or INFO to get more detailed operations -->

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,9 @@
         <commons-lang.version>2.6</commons-lang.version>
         <jayway-version>2.2.0</jayway-version>
         <resteasy-jaxrs.version>2.2.1.GA</resteasy-jaxrs.version>
-        <logback.version>1.0.7</logback.version>
+        <!-- logback 1.4.x and 1.5.x need JDK11 -->
+        <logback.version>1.3.14</logback.version>
+        <slf4j.version>2.0.12</slf4j.version>
         <wiremock.version>2.19.0</wiremock.version>
         <jackson-dataformat-csv.version>2.9.8</jackson-dataformat-csv.version>
         <commons-io.version>2.15.0</commons-io.version>
@@ -170,6 +172,16 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
             </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>