Merge pull request #1040 from ZakarFin/logging-update

Bump logging libs
oskariorg · Jan 22, 2024 · 848d04e · 848d04e
2 parents 70c7eab + de652c0
commit 848d04e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/MigrationGuide.md b/MigrationGuide.md
@@ -1,5 +1,20 @@
 # Migration guide
 
+## 2.13.0
+
+Logging dependencies updated. Oskari-based applications need to update this dependency:
+
+```
+<dependency>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j-slf4j-impl</artifactId>
+</dependency>
+```
+to:
+```
+    <artifactId>log4j-slf4j2-impl</artifactId>
+```
+
 ## 2.11.0
 
 PostgreSQL 11 is now the minimum version supported (FlywayDB dependency).

diff --git a/pom.xml b/pom.xml
@@ -107,9 +107,9 @@
         <xmlunit.version>1.6</xmlunit.version>
         <h2database.version>2.2.220</h2database.version>
 
-        <log4j.version>2.20.0</log4j.version>
+        <log4j.version>2.22.1</log4j.version>
 
-        <slf4j.version>1.7.36</slf4j.version>
+        <slf4j.version>2.0.11</slf4j.version>
         <metrics.version>4.1.0</metrics.version>
         <xom.version>1.2.5</xom.version>
     </properties>
@@ -858,16 +858,19 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <!-- Includes slf4j-api and log4j-api,
+                 but control-admin needs log4j stuff anyway for LoggerHandler
+                 so might as well declare them here -->
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j2-impl</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>

diff --git a/service-logging/pom.xml b/service-logging/pom.xml
@@ -15,13 +15,9 @@
             <groupId>org.oskari</groupId>
             <artifactId>service-base</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/webapp-setup/pom.xml b/webapp-setup/pom.xml
@@ -36,7 +36,7 @@
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
 
         <dependency>