From 65018418234a70dd1492485c8948f4ae56500de4 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Thu, 11 Jun 2009 11:54:15 +0000 Subject: [PATCH] - fixed test scope issue in log4j-over-slf4j - setting version number to 1.5.8 - updating news --- integration/pom.xml | 2 +- jcl-over-slf4j/pom.xml | 2 +- jcl104-over-slf4j/pom.xml | 2 +- jul-to-slf4j/pom.xml | 2 +- log4j-over-slf4j/pom.xml | 3 ++- osgi-over-slf4j/pom.xml | 2 +- pom.xml | 2 +- slf4j-api/pom.xml | 2 +- slf4j-api/src/main/java/org/slf4j/LoggerFactory.java | 2 +- .../main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- .../main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-jdk14/pom.xml | 2 +- .../main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-log4j12/pom.xml | 2 +- .../main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- .../main/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 +- .../main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-site/pom.xml | 2 +- slf4j-site/src/site/pages/news.html | 12 ++++++++++++ 26 files changed, 38 insertions(+), 25 deletions(-) diff --git a/integration/pom.xml b/integration/pom.xml index 395bb60e0..07eb0d558 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 115d31e5f..e7389b4b6 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index 487eda968..a5bfaf8ad 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 6f3d1671b..b2eb77376 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index eb306ecb6..6b54b9245 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 @@ -41,6 +41,7 @@ org.slf4j slf4j-jdk14 + test diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 8fc8d323b..c148a8cc7 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/pom.xml b/pom.xml index 23620f38d..4e333d257 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 pom SLF4J diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index c8ac700a4..686342eea 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index 995cbf9ed..e285830fc 100644 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -84,7 +84,7 @@ public final class LoggerFactory { *

*/ static private final String[] API_COMPATIBILITY_LIST = new String[] { - "1.5.5", "1.5.6", "1.5.7" }; + "1.5.5", "1.5.6", "1.5.7", "1.5.8" }; // private constructor prevents instantiation private LoggerFactory() { 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 1be45e43d..279653a84 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 static final StaticLoggerBinder getSingleton() { * 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 = "2.0.0"; // !final + public static String REQUESTED_API_VERSION = "1.5.8"; // !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 9f10af824..a229f65a7 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index f3fe8e819..9e283b3da 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 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 bfbc3c807..1c66b5a8b 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 static final StaticLoggerBinder getSingleton() { */ //to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "2.0.0"; + public static String REQUESTED_API_VERSION = "1.5.8"; // Binding specific code: private static final String loggerFactoryClassStr = JCLLoggerFactory.class diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index d6370fdb6..bf525d2fe 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 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 7f21a2b2e..7d7500bd5 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 static final StaticLoggerBinder getSingleton() { * 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 = "2.0.0"; // !final + public static String REQUESTED_API_VERSION = "1.5.8"; // !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 81faba471..cd4add20c 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 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 b6b9a096c..60d64535a 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 static final StaticLoggerBinder getSingleton() { * 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 = "2.0.0"; // !final + public static String REQUESTED_API_VERSION = "1.5.8"; // !final private static final String loggerFactoryClassStr = Log4jLoggerFactory.class .getName(); diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index a292824b4..c662c7fdd 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 26141a4fb..70245d432 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 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 dd556cb4c..e301c115e 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 static final StaticLoggerBinder getSingleton() { * 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 = "2.0.0"; // !final + public static String REQUESTED_API_VERSION = "1.5.8"; // !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 40e500bff..85240efea 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 19fe1329e..8df2829bd 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index da631677f..74707c174 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 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 afe151609..6d6cc035b 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 static final StaticLoggerBinder getSingleton() { * 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 = "2.0.0"; // !final + public static String REQUESTED_API_VERSION = "1.5.8"; // !final private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName(); diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index f1b2e79ec..fcb1f7973 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 2.0.0-SNAPSHOT + 1.5.8 4.0.0 diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index fa94f9021..8a9f5db7f 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -27,6 +27,18 @@

SLF4J News

+

June 11th, 2009 - Release of SLF4J 1.5.8

+ +

SLF4J version 1.5.8 consist of bug fixes. It is totally backward + compatible with SLF4J version 1.5.7.

+ +

The Maven pom file for the log4j-over-slf4j module + contained a compile time dependency on the slf4j-jdk14 + module. The dependency should have been declared in the test + scope. This problem was reported by Jean-Luc Geering on the slf4j + user list. +

+

June 10th, 2009 - Release of SLF4J 1.5.7

SLF4J version 1.5.7 consist of bug fixes and minor