The branch, master has been updated via 68af3bbdbb882da5dc4bc75bbf945acc19ce54fd (commit) from 7e1d1bb7e1200d9233e1c5c622cde6415ab41b42 (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=68af3bbdbb882da5dc4bc75bbf945acc19ce54fd http://github.com/ceki/slf4j/commit/68af3bbdbb882da5dc4bc75bbf945acc19ce54fd commit 68af3bbdbb882da5dc4bc75bbf945acc19ce54fd Author: Ceki Gulcu <c...@qos.ch> Date: Wed Sep 23 11:57:04 2009 +0200 - started work on version 1.5.10 - fixed bug 151 http://bugzilla.slf4j.org/show_bug.cgi?id=151 diff --git a/integration/pom.xml b/integration/pom.xml index ecbf85d..092b264 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 884d25a..100fae0 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index c63e906..7076ce0 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,13 +3,14 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.5.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.slf4j</groupId> <artifactId>jcl104-over-slf4j</artifactId> + <packaging>pom</packaging> <name>DEPRECATED - JCL 1.0.4 implemented over SLF4J</name> <url>http://www.slf4j.org</url> diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 51b36a2..04e4d5c 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 4917e7e..b340f98 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 35f2ccb..901e2b9 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 0287538..048c18a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.5.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> <packaging>pom</packaging> <name>SLF4J</name> diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 4304c57..e2f5002 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 bbf2fe5..23e0444 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 e2e9994..1867652 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index d67aae5..6859807 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</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 767809a..6c63536 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 0fd8f01..ab33b77 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</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 0ecce2c..b32a59d 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 10e0a07..2082425 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</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 916959e..03543ca 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 b8c02e1..8b5595a 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index d1e05de..1175b87 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</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 9d1d530..3295871 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 fe5a287..4cd8468 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 4c446e5..0955253 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index b5a1d1f..0ecee77 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</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 9bb729c..87914be 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 c0ce349..852d41a 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.9-RC0</version> + <version>1.5.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 0cfab9b..45392c7 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>4th of September, 2009 - Release of SLF4J 1.5.9-RC0</h3> + <h3>October, 2009 - Release of SLF4J 1.5.10</h3> - <p>SLF4J version 1.5.9 consist of bug fixes and minor + <p>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 <code>org.slf4j.cal10n</code> which adds <a @@ -51,8 +51,8 @@ href="http://bugzilla.slf4j.org/show_bug.cgi?id=141">bug 141</a>. </p> - <p>Fixed a NullPointerEception occuring in unspecified conditions as - described in <a + <p>Fixed a <code>NullPointerEception</code> occuring in unspecified + conditions as described in <a href="http://bugzilla.slf4j.org/show_bug.cgi?id=146">bug report 146</a> by Dapeng Ni.</p> @@ -61,6 +61,11 @@ href="http://bugzilla.slf4j.org/show_bug.cgi?id=117">bug 117</a>. </p> + <p>Fixed packaging issue in jcl104-over-slf4j which inadvertently + produced a jar file as described in <a + href="http://bugzilla.slf4j.org/show_bug.cgi?id=151">bug 151</a> by + Jesse McConnell.</p> + <hr noshade="noshade" size="1"/> <h3>June 11th, 2009 - Release of SLF4J 1.5.8</h3> ----------------------------------------------------------------------- Summary of changes: 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(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java _______________________________________________ dev mailing list dev@slf4j.org http://www.slf4j.org/mailman/listinfo/dev