From 68af3bbdbb882da5dc4bc75bbf945acc19ce54fd Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Wed, 23 Sep 2009 11:57:04 +0200 Subject: [PATCH] - started work on version 1.5.10 - fixed bug 151 http://bugzilla.slf4j.org/show_bug.cgi?id=151 --- integration/pom.xml | 2 +- jcl-over-slf4j/pom.xml | 2 +- jcl104-over-slf4j/pom.xml | 3 ++- 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 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-jdk14/pom.xml | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-log4j12/pom.xml | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-osgi-integration-test/pom.xml | 2 +- slf4j-osgi-test-bundle/pom.xml | 2 +- slf4j-simple/pom.xml | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-site/pom.xml | 2 +- slf4j-site/src/site/pages/news.html | 13 +++++++++---- 25 files changed, 34 insertions(+), 28 deletions(-) diff --git a/integration/pom.xml b/integration/pom.xml index ecbf85de..092b2648 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 884d25a1..100fae0a 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index c63e906d..7076ce0d 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,13 +3,14 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 org.slf4j jcl104-over-slf4j + pom DEPRECATED - JCL 1.0.4 implemented over SLF4J http://www.slf4j.org diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 51b36a2a..04e4d5cc 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 4917e7ef..b340f989 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 35f2ccb3..901e2b9d 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 0287538f..048c18a9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT pom SLF4J diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 4304c575..e2f50023 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index bbf2fe50..23e04445 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -61,7 +61,7 @@ public class StaticLoggerBinder { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9-RC0"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private StaticLoggerBinder() { throw new UnsupportedOperationException("This code should have never made it into the jar"); diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index e2e99944..18676527 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index d67aae59..68598076 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 767809a2..6c63536a 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -65,7 +65,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { */ //to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9-RC0"; + public static String REQUESTED_API_VERSION = "1.5.10"; // Binding specific code: private static final String loggerFactoryClassStr = JCLLoggerFactory.class diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 0fd8f010..ab33b77b 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 0ecce2ca..b32a59d5 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -66,7 +66,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9-RC0"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName(); diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 10e0a07c..20824254 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 916959e8..03543caa 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -66,7 +66,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * against. The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9-RC0"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = Log4jLoggerFactory.class .getName(); diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index b8c02e16..8b5595ad 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index d1e05de7..1175b879 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 9d1d5300..32958713 100644 --- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -66,7 +66,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9-RC0"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = NOPLoggerFactory.class.getName(); diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index fe5a2871..4cd84689 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 4c446e5a..0955253c 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index b5a1d1ff..0ecee775 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 9bb729c2..87914bec 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,7 +58,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * against. The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9-RC0"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName(); diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index c0ce3496..852d41a7 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9-RC0 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 0cfab9b1..45392c7d 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -27,9 +27,9 @@
-

4th of September, 2009 - Release of SLF4J 1.5.9-RC0

+

October, 2009 - Release of SLF4J 1.5.10

-

SLF4J version 1.5.9 consist of bug fixes and minor +

SLF4J version 1.5.10 consist of bug fixes and minor enhancements. It is totally backward compatible with SLF4J version 1.5.8. However, the slf4j-ext module ships with a new package called org.slf4j.cal10n which adds bug 141.

-

Fixed a NullPointerEception occuring in unspecified conditions as - described in Fixed a NullPointerEception occuring in unspecified + conditions as described in bug report 146 by Dapeng Ni.

@@ -61,6 +61,11 @@ href="http://bugzilla.slf4j.org/show_bug.cgi?id=117">bug 117.

+

Fixed packaging issue in jcl104-over-slf4j which inadvertently + produced a jar file as described in bug 151 by + Jesse McConnell.

+

June 11th, 2009 - Release of SLF4J 1.5.8