Upgrade SLF4J to 2.0.9

digipost · Dec 5, 2023 · 201847b · 201847b
1 parent 1344ad0
commit 201847b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/NOTICE b/NOTICE
@@ -36,7 +36,6 @@ This software includes third party software subject to the following licenses:
   JAXB2 Basics - Runtime under BSD-Style License
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
   JUL to SLF4J bridge under MIT License
-  Log4j Implemented Over SLF4J under Apache Software Licenses
   micrometer-commons under The Apache Software License, Version 2.0
   micrometer-observation under The Apache Software License, Version 2.0
   Old JAXB Core under CDDL+GPL License

diff --git a/api-client/pom.xml b/api-client/pom.xml
@@ -55,10 +55,6 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
@@ -68,6 +64,11 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>no.digipost</groupId>
+            <artifactId>jul-to-slf4j-junit-extension</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Spring -->
 

diff --git a/api-client/src/test/resources/junit-platform.properties b/api-client/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+junit.jupiter.extensions.autodetection.enabled=true
diff --git a/api-commons/pom.xml b/api-commons/pom.xml
@@ -108,6 +108,11 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>no.digipost</groupId>
+            <artifactId>jul-to-slf4j-junit-extension</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/api-commons/src/test/resources/junit-platform.properties b/api-commons/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+junit.jupiter.extensions.autodetection.enabled=true
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
 
-        <org.slf4j.version>1.7.36</org.slf4j.version>
+        <org.slf4j.version>2.0.9</org.slf4j.version>
         <spring.ws.version>4.0.8</spring.ws.version>
         <wss4j.version>3.0.2</wss4j.version>
         <jaxb2-basics.version>0.13.1</jaxb2-basics.version>
@@ -66,12 +66,6 @@
                 <version>${org.slf4j.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>log4j-over-slf4j</artifactId>
-                <version>${org.slf4j.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jul-to-slf4j</artifactId>
@@ -84,6 +78,11 @@
                 <version>${org.slf4j.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>no.digipost</groupId>
+                <artifactId>jul-to-slf4j-junit-extension</artifactId>
+                <version>1.0</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.junit</groupId>