From 86e0c2990d8feec0451eb2ab2d0767776114b94a Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Fri, 14 Sep 2012 23:00:20 +0200 Subject: [PATCH] preparing release 1.7.1 --- integration/pom.xml | 2 +- jcl-over-slf4j/pom.xml | 2 +- jul-to-slf4j/pom.xml | 2 +- log4j-over-slf4j/pom.xml | 2 +- osgi-over-slf4j/pom.xml | 2 +- pom.xml | 2 +- slf4j-api/pom.xml | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- slf4j-jdk14/pom.xml | 2 +- slf4j-log4j12/pom.xml | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- slf4j-simple/pom.xml | 2 +- .../src/main/java/org/slf4j/impl/SimpleLogger.java | 8 +++++--- .../src/test/java/org/slf4j/impl/SimpleLoggerTest.java | 7 +++++++ slf4j-site/pom.xml | 2 +- slf4j-site/src/site/pages/news.html | 10 ++++++---- 18 files changed, 33 insertions(+), 22 deletions(-) diff --git a/integration/pom.xml b/integration/pom.xml index 7c48eb74..539448d1 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 7dd612e0..a277e1b3 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -4,7 +4,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index f47c6fc2..86ee84e5 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index d535586f..0b379d2e 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 2b05d76c..53a7cfb9 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/pom.xml b/pom.xml index 904e3909..1e800c6f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 pom SLF4J diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 5e47e85f..e3e77d65 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index b1535fd0..77bda109 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index c672d8bc..a312a40b 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 0c42a8f9..620530f1 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 641c05de..0179d4f1 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 229422f7..c9fd64cf 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 22e0d3d8..d67429c6 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index dc035156..1f8efbe2 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -4,7 +4,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index b77b75dd..f38feed3 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -54,9 +54,11 @@ import org.slf4j.spi.LocationAwareLogger; *
  • org.slf4j.simpleLogger.defaultLogLevel - Default log level for all instances of SimpleLogger. * Must be one of ("trace", "debug", "info", "warn", or "error"). If not specified, defaults to "info".
    • * - *
  • org.slf4j.simpleLogger.log.xxxxx - Logging detail level for a SimpleLogger instance named "xxxxx". - * Must be one of ("trace", "debug", "info", "warn", or "error"). If not specified, the level the nearest parent logger - * will be used, and if none is set, then the default level will be used.
    • + *
  • org.slf4j.simpleLogger.log.a.b.c - Logging detail level for a SimpleLogger instance + * named "a.b.c". Right-side value must be one of "trace", "debug", "info", "warn", or "error". When a SimpleLogger + * named "a.b.c" is initialized, its level is assigned from this property. If unspecified, the level of nearest parent + * logger will be used, and if none is set, then the value specified by + * org.slf4j.simpleLogger.defaultLogLevel will be used.
    • * *
  • org.slf4j.simpleLogger.showDateTime - Set to true if you want the current date and * time to be included in output messages. Default is true
    • diff --git a/slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java b/slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java index d762c136..1ac777d3 100644 --- a/slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java +++ b/slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java @@ -30,6 +30,7 @@ import org.junit.Test; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; +import static junit.framework.Assert.fail; public class SimpleLoggerTest { @@ -43,6 +44,12 @@ public class SimpleLoggerTest { System.clearProperty(A_KEY); } + @Test + public void emptyLoggerName() { + SimpleLogger simpleLogger = new SimpleLogger("a"); + assertEquals("info", simpleLogger.recursivelyComputeLevelString()); + } + @Test public void loggerNameWithNoDots_WithLevel() { SimpleLogger simpleLogger = new SimpleLogger("a"); diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 72500b40..4a0012db 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.7.1-SNAPSHOT + 1.7.1 4.0.0 diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index e8522472..351d5320 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -34,16 +34,18 @@

    SimpleLogger now supports writing to a file. The property names for configuring - SimpleLogger have been modified to be consistently all - in camel case. More configuration options have been added. In the + SimpleLogger have been modified to be consistently in + camel case. More configuration options have been added. In the absence of configuration directives, SimpleLogger will - behave same as in the past.

    + behave same as in the past. If you are configuring + SimpleLogger with configuration properties, you will + need to adapt to the new and more consistent property names.

    6th of September, 2012 - Release of SLF4J 1.7.0

    -

    SLF4J now requires JDK 1.5.

    +

    SLF4J now requires JDK 1.5.

    Printing methods in the Logger interface now offers