Merge pull request #216 from kovaceviccz/upgrade-slf4j-to-2.x

Upgrade SLF4J to 2.x

Author: pavelhoral

legal-notices/THIRDPARTYREADME.txt

@@ -951,11 +951,11 @@ Copyright: Copyright 2008 Sebo Zoltan <iamzoli@yahoo.com>
 Version: isorelax-20030108.jar
 Copyright: Copyright 2001 Kohsuke KAWAGUCHI
 
-Version: slf4j-api-1.7.5.jar
-Copyright: Copyright 2004-2013 QOS.ch
+Version: slf4j-api-2.0.17.jar
+Copyright: Copyright 2004-2025 QOS.ch
 
-Version: slf4j-nop-1.7.5.jar
-Copyright: Copyright 2004-2013 QOS.ch
+Version: slf4j-nop-2.0.17.jar
+Copyright: Copyright 2004-2025 QOS.ch
 
 Version: slf4j-jdk14-1.7.5.jar
 Copyright: Copyright 2004-2007 QOS.ch

openam-server-only/src/main/webapp/WEB-INF/weblogic.xml

@@ -13,6 +13,7 @@
   ~ information: "Portions copyright [year] [name of copyright owner]".
   ~
   ~ Copyright 2015-2016 ForgeRock AS.
+  ~ Portions copyright 2025 Wren Security.
   -->
 <weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -39,7 +40,7 @@
             <package-name>org.slf4j.bridge.*</package-name>
         </prefer-application-packages>
         <prefer-application-resources>
-            <resource-name>org/slf4j/impl/StaticLoggerBinder.class</resource-name>
+            <resource-name>META-INF/services/org.slf4j.spi.SLF4JServiceProvider</resource-name>
         </prefer-application-resources>
     </container-descriptor>
-</weblogic-web-app>
+</weblogic-web-app>

openam-slf4j/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.2</version>
+            <version>2.0.17</version>
         </dependency>
 
         <dependency>

openam-slf4j/src/main/java/org/forgerock/openam/slf4j/AMDebugLogger.java

@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2025 Wren Security.
  */
 
 package org.forgerock.openam.slf4j;
@@ -29,6 +30,7 @@ public class AMDebugLogger extends MarkerIgnoringBase {
 
     public AMDebugLogger(Debug debug) {
         this.debug = debug;
+        this.name = debug.getName();
     }
 
     public boolean isTraceEnabled() {

openam-slf4j/src/main/java/org/forgerock/openam/slf4j/AMSlf4jServiceProvider.java

@@ -0,0 +1,65 @@
+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.1.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.1.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2025 Wren Security. All rights reserved.
+ */
+package org.forgerock.openam.slf4j;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.IMarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
+import org.slf4j.helpers.NOPMDCAdapter;
+import org.slf4j.spi.MDCAdapter;
+import org.slf4j.spi.SLF4JServiceProvider;
+
+/**
+ * SLF4J service provider implementation which registers {@link AMLoggerFactory} as the logger factory.
+ */
+public class AMSlf4jServiceProvider implements SLF4JServiceProvider {
+
+    /**
+     * Version of the SLF4J API this implementation is compiled against.
+     */
+    public static String REQUESTED_API_VERSION = "2.0.17";
+
+    private final IMarkerFactory markerFactory = new BasicMarkerFactory();
+
+    private final MDCAdapter mdcAdapter = new NOPMDCAdapter();
+
+    private ILoggerFactory loggerFactory;
+
+    @Override
+    public ILoggerFactory getLoggerFactory() {
+        return loggerFactory;
+    }
+
+    @Override
+    public IMarkerFactory getMarkerFactory() {
+        return markerFactory;
+    }
+
+    @Override
+    public MDCAdapter getMDCAdapter() {
+        return mdcAdapter;
+    }
+
+    @Override
+    public String getRequestedApiVersion() {
+        return REQUESTED_API_VERSION;
+    }
+
+    @Override
+    public void initialize() {
+        loggerFactory = new AMLoggerFactory();
+    }
+}

openam-slf4j/src/main/java/org/slf4j/impl/StaticLoggerBinder.java

@@ -0,0 +1 @@
+org.forgerock.openam.slf4j.AMSlf4jServiceProvider

openam-slf4j/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider

@@ -183,7 +183,7 @@
         <java-ipv6.version>0.17</java-ipv6.version>
         <javassist.version>3.29.1-GA</javassist.version>
         <restlet.version>2.6.0</restlet.version>
-        <slf4j.version>1.7.36</slf4j.version>
+        <slf4j.version>2.0.17</slf4j.version>
         <snakeyaml.version>2.2</snakeyaml.version>
 
         <!-- WS / RS Related Dependencies -->