diff --git a/integration/pom.xml b/integration/pom.xml index 49e58069..8be591f6 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index a2883371..fb15e80c 100755 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -4,7 +4,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index a50bc8a4..d932bcae 100755 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 jul-to-slf4j diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index fe300c72..9fa7305e 100755 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 242d8a0c..23a3b336 100755 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 osgi-over-slf4j diff --git a/pom.xml b/pom.xml index 16ebb65a..75c042f8 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 pom SLF4J diff --git a/slf4j-android/pom.xml b/slf4j-android/pom.xml index 6ff1fad2..0058af5e 100644 --- a/slf4j-android/pom.xml +++ b/slf4j-android/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 4.0.0 diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 60846014..84d453d6 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-api @@ -19,12 +19,6 @@ http://www.slf4j.org - - com.google.code.findbugs - jsr305 - 2.0.1 - true - diff --git a/slf4j-api/src/main/java/org/slf4j/ILoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/ILoggerFactory.java index ee0e61cf..347cddf3 100644 --- a/slf4j-api/src/main/java/org/slf4j/ILoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/ILoggerFactory.java @@ -24,9 +24,6 @@ */ package org.slf4j; -import javax.annotation.Nonnull; - - /** * ILoggerFactory instances manufacture {@link Logger} * instances by name. @@ -56,6 +53,5 @@ public interface ILoggerFactory { * @param name the name of the Logger to return * @return a Logger instance */ - @Nonnull - public Logger getLogger(@Nonnull String name); + public Logger getLogger(String name); } diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index 87efaa71..81450333 100755 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -33,8 +33,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; - import org.slf4j.helpers.NOPLoggerFactory; import org.slf4j.helpers.SubstituteLogger; import org.slf4j.helpers.SubstituteLoggerFactory; @@ -282,8 +280,7 @@ public final class LoggerFactory { * @param name The name of the logger. * @return logger */ - @Nonnull - public static Logger getLogger(@Nonnull String name) { + public static Logger getLogger(String name) { ILoggerFactory iLoggerFactory = getILoggerFactory(); return iLoggerFactory.getLogger(name); } @@ -304,8 +301,7 @@ public final class LoggerFactory { * * @see Detected logger name mismatch */ - @Nonnull - public static Logger getLogger(@Nonnull Class clazz) { + public static Logger getLogger(Class clazz) { Logger logger = getLogger(clazz.getName()); if (DETECT_LOGGER_NAME_MISMATCH) { Class autoComputedCallingClass = Util.getCallingClass(); @@ -330,7 +326,6 @@ public final class LoggerFactory { * * @return the ILoggerFactory instance in use */ - @Nonnull public static ILoggerFactory getILoggerFactory() { if (INITIALIZATION_STATE == UNINITIALIZED) { INITIALIZATION_STATE = ONGOING_INITIALIZATION; diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 5386c375..50b67839 100755 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-ext diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index 2024b007..77ae8fb4 100755 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-jcl diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 462b7b7b..d62fd171 100755 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-jdk14 diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 40ad1e16..6d2571d9 100755 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-log4j12 diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 3bc2e124..14c54e56 100755 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-migrator diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 1e8f659f..492c7be9 100755 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-nop diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index ea3040c1..d8757c18 100755 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-simple diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 15141afc..4c26a0d0 100755 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.9-SNAPSHOT + 1.7.9 slf4j-site diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index f835c25b..cc686d8e 100755 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -29,7 +29,18 @@
-

14th of December, 2014 - Release of SLF4J 1.7.8

+

16th of December, 2014 - Release of SLF4J 1.7.8

+ +

The introduction of the @Nonnull JSR 305 annotation in SLF4J + version 1.7.8 causes the Scala compiler to fail. This is issue has + been documented in SI-5420. Given + that many Scala users will be affected by this issue for the + foreseeable future, we have decided to renounce the user of JSR 305 + annotations in SLF4J for the time being. +

+ +

14th of December, 2014 - Release of SLF4J 1.7.8

Spot incorrectly named loggers by setting the