Update SLF4J/Logback

release-engineering · Nov 30, 2023 · 5f571fe · 5f571fe
1 parent 9677531
commit 5f571fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cli/src/test/java/org/commonjava/maven/ext/cli/CliTest.java b/cli/src/test/java/org/commonjava/maven/ext/cli/CliTest.java
@@ -297,8 +297,8 @@ public void checkDependencies()
 
         assertTrue( cliOutput.contains( "Found 83" ) );
         assertTrue( cliOutput.matches( "(?s).*"
-                + "ch.qos.logback:logback-classic:1.2.[.\\d+]+\\s+                                 jar                                     compile             \n"
-                + "ch.qos.logback:logback-core:1.2.[.\\d+]+\\s+                                    jar                                     compile             \n"
+                + "ch.qos.logback:logback-classic:1.[.\\d+]+\\s+                                   jar                                     compile             \n"
+                + "ch.qos.logback:logback-core:1.[.\\d+]+\\s+                                      jar                                     compile             \n"
                 + "com.fasterxml.jackson.core:jackson-annotations:2.[.\\w+|\\a|-]+\\s+             jar                                     compile             \n"
                 + "com.fasterxml.jackson.core:jackson-core:2.[.\\w+|-]+\\s+                        jar                                     compile             \n"
                 + "com.fasterxml.jackson.core:jackson-databind:2.[.\\w+|-]+\\s+                    jar                                     compile             \n"
@@ -364,7 +364,7 @@ public void checkDependencies()
                 + "org.jdom:jdom2:2.[.\\d+]+\\s+                                                   jar                                     compile             \n"
                 + "org.projectlombok:lombok:1.[.\\d+]+\\s+                                         jar                                     provided            \n"
                 + "org.projectlombok:lombok-maven-plugin:1.[.\\d+]+\\s+                            maven-plugin                                                \n"
-                + "org.slf4j:slf4j-api:1.[.\\d+]+\\s+                                              jar                                     compile             \n"
+                + "org.slf4j:slf4j-api:2.[.\\d+]+\\s+                                              jar                                     compile             \n"
                 + "org.xmlunit:xmlunit-core:2.[.\\d+]+\\s+                                         jar                                     test                \n"
                 + "org.xmlunit:xmlunit-matchers:2.[.\\d+]+\\s+                                     jar                                     test                \n"
                 + "org.yaml:snakeyaml:2.[.\\d+]+\\s+                                               jar                                     compile.*") );

diff --git a/common/src/test/java/org/commonjava/maven/ext/common/util/ManifestUtilsTest.java b/common/src/test/java/org/commonjava/maven/ext/common/util/ManifestUtilsTest.java
@@ -51,7 +51,6 @@ public void testNoClass()
     public void testThisClass()
     {
         ManifestUtils.getManifestInformation( ManifestUtilsTest.class );
-
         assertTrue( systemRule.getLog()
                               .contains( "Unable to retrieve manifest for class "
                                                          + "org.commonjava.maven.ext.common.util.ManifestUtilsTest as "

diff --git a/pom.xml b/pom.xml
@@ -85,7 +85,8 @@
     <groovyVersion>3.0.17</groovyVersion>
     <unirestVersion>3.14.2</unirestVersion>
     <jsonPathVersion>2.8.0</jsonPathVersion>
-    <slf4jVersion>1.7.36</slf4jVersion>
+    <slf4jVersion>2.0.9</slf4jVersion>
+    <logbackVersion>1.3.12</logbackVersion>
     <docletVersion>1.1</docletVersion>
     <lombokPluginVersion>1.18.20.0</lombokPluginVersion>
     <shadePluginVersion>3.2.4</shadePluginVersion>
@@ -423,12 +424,12 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.2.9</version>
+        <version>${logbackVersion}</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.2.9</version>
+        <version>${logbackVersion}</version>
       </dependency>
 
       <dependency>