(logging-log4j2) branch main updated: Port `log4j-to-slf4j` changes from `2.x` (#2015)

[vy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main by this push:
     new 6564ffb2dd Port `log4j-to-slf4j` changes from `2.x` (#2015)
6564ffb2dd is described below

commit 6564ffb2dd077d0570902ad4619538065d2dd732
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Nov 29 13:15:11 2023 +0100

    Port `log4j-to-slf4j` changes from `2.x` (#2015)
---
 log4j-to-slf4j/pom.xml                             | 34 ++++++++++++++++++++--
 .../java/org/apache/logging/slf4j/SLF4JLogger.java |  3 --
 .../apache/logging/slf4j/SLF4JLoggerContext.java   |  3 --
 .../logging/slf4j/SLF4JLoggerContextFactory.java   |  3 --
 .../java/org/apache/logging/slf4j/LoggerTest.java  |  4 +--
 5 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index 5996949f0e..03d2128d6f 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -32,11 +32,16 @@
     <!--
       ~ OSGi and JPMS options
       -->
-    <slf4j.support.bound>3</slf4j.support.bound>
+    <slf4j.support.range>[1.7,3)</slf4j.support.range>
     <bnd-extra-package-options>
       <!-- This bridge also support SLF4J 2.x -->
-      org.slf4j.*;version="${range;[==,${slf4j.support.bound})}"
+      org.slf4j.*;version="${slf4j.support.range}"
     </bnd-extra-package-options>
+    <bnd-extra-module-options>
+      <!-- The module descriptor is in `META-INF/versions/9`
+           BND 6.x can not find it -->
+      org.slf4j;substitute="slf4j-api"
+    </bnd-extra-module-options>
   </properties>
   <dependencies>
     <dependency>
@@ -95,4 +100,29 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <!--
+        ~ Unban Logback.
+        -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ban-logging-dependencies</id>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <includes>
+                    <include>ch.qos.logback:*:*:*:test</include>
+                  </includes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
index 775532367b..64be7b447c 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
@@ -29,9 +29,6 @@ import org.slf4j.LoggerFactory;
 import org.slf4j.MarkerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
-/**
- *
- */
 public class SLF4JLogger extends AbstractLogger {
 
     /**
diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
index d2b922be81..f0aee0af41 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
@@ -22,9 +22,6 @@ import org.apache.logging.log4j.spi.LoggerContext;
 import org.apache.logging.log4j.spi.LoggerRegistry;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class SLF4JLoggerContext implements LoggerContext {
     private final LoggerRegistry<ExtendedLogger> loggerRegistry = new LoggerRegistry<>();
 
diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
index 510d07b8aa..e1ca5d4483 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
@@ -22,9 +22,6 @@ import org.apache.logging.log4j.spi.LoggerContextFactory;
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.util.LoaderUtil;
 
-/**
- *
- */
 public class SLF4JLoggerContextFactory implements LoggerContextFactory {
     private static final StatusLogger LOGGER = StatusLogger.getLogger();
     private static final LoggerContext context = new SLF4JLoggerContext();
diff --git a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
index cda5cc8d63..47d760aa7b 100644
--- a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
+++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.logging.slf4j;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
@@ -43,7 +42,6 @@ import org.slf4j.MDC;
 @LoggerContextSource
 public class LoggerTest {
 
-    private static final String STRING = "String";
     // Log4j objects
     private Logger logger;
     // Logback objects
@@ -72,7 +70,7 @@ public class LoggerTest {
 
     @Test
     public void simpleFlow() {
-        logger.traceEntry(STRING);
+        logger.traceEntry("foo");
         logger.traceExit(0);
         assertThat(list.strList, hasSize(2));
     }