diff --git a/integration/pom.xml b/integration/pom.xml index 092b2648..59bf4023 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 100fae0a..a793148b 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index 7076ce0d..0523e5ab 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 04e4d5cc..e64564a5 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index b340f989..c89cdc1d 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 901e2b9d..9f241f41 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/pom.xml b/pom.xml index aab9c493..dff4a747 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 pom SLF4J @@ -27,8 +27,10 @@ + 0.7.2 + slf4j-api slf4j-simple diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index e2f50023..b96f4bf3 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 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 6397ae06..ae60365a 100644 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -83,7 +83,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.8", "1.5.9-RC0", "1.5.10" }; + "1.5.5", "1.5.6", "1.5.7", "1.5.8", "1.5.9.RC1", "1.5.10" }; // 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 23e04445..bddc36a9 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.10"; // !final + public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !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 18676527..2dc65fb3 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF index b3721461..8760afad 100644 --- a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-SymbolicName: slf4j.ext Bundle-Name: slf4j-log4j12 Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.slf4j.profiler;version=${project.version} +Export-Package: org.slf4j.profiler;version=${project.version}, ch.qos.cal10n;version=${cal10n.version} Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version} diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index 68598076..a52fe22c 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 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 6c63536a..794bc9e5 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.10"; + public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // Binding specific code: private static final String loggerFactoryClassStr = JCLLoggerFactory.class diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index ab33b77b..3a2fd276 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 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 b32a59d5..5c423b91 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.10"; // !final + public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !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 20824254..d0ae4bc8 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 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 03543caa..e2e74616 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.10"; // !final + public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !final private static final String loggerFactoryClassStr = Log4jLoggerFactory.class .getName(); diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 8b5595ad..c2b65b3c 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 1175b879..4d002f5b 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 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 32958713..1e622ee9 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.10"; // !final + public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !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 4cd84689..147a1bb8 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.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 0955253c..ce8cab87 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.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 0ecee775..849e6cf0 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 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 87914bec..51c6901b 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.10"; // !final + public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !final private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName(); diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 852d41a7..6cb0e641 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.9.RC1 4.0.0 diff --git a/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html index a6e66196..ee9bf446 100644 --- a/slf4j-site/src/site/pages/download.html +++ b/slf4j-site/src/site/pages/download.html @@ -24,11 +24,18 @@

Download version ${project.version} including full source code, class files and documentation in ZIP or TAR.GZ format:

+

Stable version

+ + + +

Release candidate (not for production use)

diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index f33fd4c4..076af3ad 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -27,9 +27,9 @@
-

October, 2009 - Release of SLF4J 1.5.10

+

October 28th, 2009 - Release of SLF4J 1.5.9.RC1

-

SLF4J version 1.5.10 consist of bug fixes and minor +

SLF4J version 1.5.9.RC1 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 CAL10N API.

+

Added missing "Export-Package" declaration for cal10n in the OSGi + manifest file for sfl4j-ext. This was requested in bug 156 by + Pete Muir.

+

In log4j-over-slf4j, added missing log(...) methods as requested by Zoltan Szel in bug report