natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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.
This commit is contained in:
Ceki Gulcu 2009-10-28 18:49:56 +01:00
parent 745cf07ee7
commit e967f5135e
28 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/pom.xml
View File

@ -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>

2
jcl-over-slf4j/pom.xml
View File

@ -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>

2
jcl104-over-slf4j/pom.xml
View File

@ -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>

2
jul-to-slf4j/pom.xml
View File

@ -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>

2
log4j-over-slf4j/pom.xml
View File

@ -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>

2
osgi-over-slf4j/pom.xml
View File

@ -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>

4
pom.xml
View File

@ -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>

2
slf4j-api/pom.xml
View File

@ -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>

2
slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
View File

@ -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() {

2
slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View File

@ -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");

2
slf4j-ext/pom.xml
View File

@ -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>

2
slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
View File

@ -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}

2
slf4j-jcl/pom.xml
View File

@ -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>

2
slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View File

@ -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

2
slf4j-jdk14/pom.xml
View File

@ -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>

2
slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View File

@ -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();

2
slf4j-log4j12/pom.xml
View File

@ -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>

2
slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View File

@ -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();

2
slf4j-migrator/pom.xml
View File

@ -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>

2
slf4j-nop/pom.xml
View File

@ -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>

2
slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View File

@ -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();

2
slf4j-osgi-integration-test/pom.xml
View File

@ -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>

2
slf4j-osgi-test-bundle/pom.xml
View File

@ -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>

2
slf4j-simple/pom.xml
View File

@ -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>

2
slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View File

@ -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();

2
slf4j-site/pom.xml
View File

@ -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>

11
slf4j-site/src/site/pages/download.html
View File

@ -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>

9
slf4j-site/src/site/pages/news.html
View File

@ -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