diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index 5996949f0e9..03d2128d6fa 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -32,11 +32,16 @@ - 3 + [1.7,3) - org.slf4j.*;version="${range;[==,${slf4j.support.bound})}" + org.slf4j.*;version="${slf4j.support.range}" + + + org.slf4j;substitute="slf4j-api" + @@ -95,4 +100,29 @@ + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-logging-dependencies + + + + + ch.qos.logback:*:*:*:test + + + + + + + + + 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 775532367b1..64be7b447ca 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.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 d2b922be810..f0aee0af414 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.LoggerRegistry; import org.slf4j.LoggerFactory; -/** - * - */ public class SLF4JLoggerContext implements LoggerContext { private final LoggerRegistry 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 510d07b8aa0..e1ca5d44831 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.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 cda5cc8d639..47d760aa7b9 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 @@ @LoggerContextSource public class LoggerTest { - private static final String STRING = "String"; // Log4j objects private Logger logger; // Logback objects @@ -72,7 +70,7 @@ public void basicFlow() { @Test public void simpleFlow() { - logger.traceEntry(STRING); + logger.traceEntry("foo"); logger.traceExit(0); assertThat(list.strList, hasSize(2)); }