natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

version 1.7.9 reverts the of JSR 305 annotations 

See https://issues.scala-lang.org/browse/SI-5420
This commit is contained in:
Ceki Gulcu 2014-12-16 22:56:05 +01:00
parent f62801b7f1
commit cdcdebbae3
19 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>

2
jcl-over-slf4j/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jul-to-slf4j/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>jul-to-slf4j</artifactId>

2
log4j-over-slf4j/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>

2
osgi-over-slf4j/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>osgi-over-slf4j</artifactId>

2
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
<packaging>pom</packaging>
<name>SLF4J</name>

2
slf4j-android/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
slf4j-api/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-api</artifactId>
@ -19,12 +19,6 @@
<url>http://www.slf4j.org</url>
<dependencies>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>

6
slf4j-api/src/main/java/org/slf4j/ILoggerFactory.java
View File

@ -24,9 +24,6 @@
*/
package org.slf4j;
import javax.annotation.Nonnull;
/**
* <code>ILoggerFactory</code> 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);
}

9
slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
View File

@ -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 <a href="http://www.slf4j.org/codes.html#loggerNameMismatch">Detected logger name mismatch</a>
*/
@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;

2
slf4j-ext/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-ext</artifactId>

2
slf4j-jcl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-jcl</artifactId>

2
slf4j-jdk14/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-jdk14</artifactId>

2
slf4j-log4j12/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-log4j12</artifactId>

2
slf4j-migrator/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-migrator</artifactId>

2
slf4j-nop/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-nop</artifactId>

2
slf4j-simple/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-simple</artifactId>

2
slf4j-site/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.9-SNAPSHOT</version>
<version>1.7.9</version>
</parent>
<artifactId>slf4j-site</artifactId>

13
slf4j-site/src/site/pages/news.html
View File

@ -29,7 +29,18 @@
<hr noshade="noshade" size="1"/>
<h3>14th of December, 2014 - Release of SLF4J 1.7.8 </h3>
<h3>16th of December, 2014 - Release of SLF4J 1.7.8</h3>
<p>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 <a
href="https://issues.scala-lang.org/browse/SI-5420">SI-5420</a>. 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.
</p>
<h3>14th of December, 2014 - Release of SLF4J 1.7.8</h3>
<p class="highlight"><a href="codes.html#loggerNameMismatch">Spot
incorrectly named loggers</a> by setting the