The branch, master has been updated
via e967f5135e1bd2eb0d3165ec08cdb7a35bd1b200 (commit)
from 745cf07ee745b658ff65de533b701f0d97e15cc4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=e967f5135e1bd2eb0d3165ec08cdb7a35bd1b200
http://github.com/ceki/slf4j/commit/e967f5135e1bd2eb0d3165ec08cdb7a35bd1b200
commit e967f5135e1bd2eb0d3165ec08cdb7a35bd1b200
Author: Ceki Gulcu <c...@qos.ch>
Date: Wed Oct 28 18:49:56 2009 +0100
- Added missing "Export-Package" declaration for cal10n in the OSGi
manifest file for sfl4j-ext, fixing bug 156.
- changed version number to 1.5.9.RC1. This fixes bug 157.
diff --git a/integration/pom.xml b/integration/pom.xml
index 092b264..59bf402 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index 100fae0..a793148 100644
--- a/jcl-over-slf4j/pom.xml
+++ b/jcl-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml
index 7076ce0..0523e5a 100644
--- a/jcl104-over-slf4j/pom.xml
+++ b/jcl104-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index 04e4d5c..e64564a 100644
--- a/jul-to-slf4j/pom.xml
+++ b/jul-to-slf4j/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index b340f98..c89cdc1 100644
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index 901e2b9..9f241f4 100644
--- a/osgi-over-slf4j/pom.xml
+++ b/osgi-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index aab9c49..dff4a74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
<packaging>pom</packaging>
<name>SLF4J</name>
@@ -27,8 +27,10 @@
</licenses>
<properties>
+ <cal10n.version>0.7.2</cal10n.version>
</properties>
+
<modules>
<module>slf4j-api</module>
<module>slf4j-simple</module>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index e2f5002..b96f4bf 100644
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
index 6397ae0..ae60365 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 {
* <p>
*/
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 23e0444..bddc36a 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 1867652..2dc65fb 100644
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
index b372146..8760afa 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 6859807..a52fe22 100644
--- a/slf4j-jcl/pom.xml
+++ b/slf4j-jcl/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 6c63536..794bc9e 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 ab33b77..3a2fd27 100644
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 b32a59d..5c423b9 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 2082425..d0ae4bc 100644
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 03543ca..e2e7461 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 8b5595a..c2b65b3 100644
--- a/slf4j-migrator/pom.xml
+++ b/slf4j-migrator/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index 1175b87..4d002f5 100644
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 3295871..1e622ee 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 4cd8468..147a1bb 100644
--- a/slf4j-osgi-integration-test/pom.xml
+++ b/slf4j-osgi-integration-test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml
index 0955253..ce8cab8 100644
--- a/slf4j-osgi-test-bundle/pom.xml
+++ b/slf4j-osgi-test-bundle/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index 0ecee77..849e6cf 100644
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 87914be..51c6901 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 852d41a..6cb0e64 100644
--- a/slf4j-site/pom.xml
+++ b/slf4j-site/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.10-SNAPSHOT</version>
+ <version>1.5.9.RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-site/src/site/pages/download.html
b/slf4j-site/src/site/pages/download.html
index a6e6619..ee9bf44 100644
--- a/slf4j-site/src/site/pages/download.html
+++ b/slf4j-site/src/site/pages/download.html
@@ -24,11 +24,18 @@
<p>Download version ${project.version} including <i>full source code</i>,
class files and documentation in ZIP or TAR.GZ format: </p>
+ <p>Stable version</p>
+
+ <ul>
+ <li><a href="dist/slf4j-1.5.8.tar.gz"><b>slf4j-1.5.8.tar.gz</b></a> </li>
+ <li><a href="dist/slf4j-1.5.8.zip"><b>slf4j-1.5.8.zip</b></a> </li>
+ </ul>
+
+ <p>Release candidate <b style="color:#F44; font-size:larger;">(not for
production use)</b></p>
<ul>
<li><a
href="dist/slf4j-${project.version}.tar.gz"><b>slf4j-${project.version}.tar.gz</b></a>
</li>
- <li><a
href="dist/slf4j-${project.version}.zip"><b>slf4j-${project.version}.zip</b></a>
</li>
-
+ <li><a
href="dist/slf4j-${project.version}.zip"><b>slf4j-${project.version}.zip</b></a>
</li>
</ul>
diff --git a/slf4j-site/src/site/pages/news.html
b/slf4j-site/src/site/pages/news.html
index f33fd4c..076af3a 100644
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -27,9 +27,9 @@
<hr noshade="noshade" size="1"/>
- <h3>October, 2009 - Release of SLF4J 1.5.10</h3>
+ <h3>October 28th, 2009 - Release of SLF4J 1.5.9.RC1</h3>
- <p>SLF4J version 1.5.10 consist of bug fixes and minor
+ <p>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
<code>org.slf4j.cal10n</code> which adds <a
@@ -37,6 +37,11 @@
support as a thin layer built upon the <a
href="http://cal10n.qos.ch";>CAL10N API</a>.</p>
+ <p>Added missing "Export-Package" declaration for cal10n in the OSGi
+ manifest file for sfl4j-ext. This was requested in <a
+ href="http://bugzilla.slf4j.org/show_bug.cgi?id=156";>bug 156</a> by
+ Pete Muir.</p>
+
<p>In log4j-over-slf4j, added missing log(...) methods as requested
by Zoltan Szel in <a
href="http://bugzilla.slf4j.org/show_bug.cgi?id=139";>bug report
-----------------------------------------------------------------------
Summary of changes:
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 | 2 +-
osgi-over-slf4j/pom.xml | 2 +-
pom.xml | 4 +++-
slf4j-api/pom.xml | 2 +-
.../src/main/java/org/slf4j/LoggerFactory.java | 2 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +-
slf4j-ext/pom.xml | 2 +-
slf4j-ext/src/main/resources/META-INF/MANIFEST.MF | 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/download.html | 11 +++++++++--
slf4j-site/src/site/pages/news.html | 9 +++++++--
28 files changed, 44 insertions(+), 30 deletions(-)
hooks/post-receive
--
SLF4J: Simple Logging Facade for Java
_______________________________________________
dev mailing list
dev@slf4j.org
http://www.slf4j.org/mailman/listinfo/dev
