-
@@ -37,13 +49,47 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -57,23 +103,48 @@
+ testMatch,
+ testMultiBinding,
+ testFuture_16Series">
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -81,7 +152,9 @@
-
+
@@ -89,7 +162,44 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/integration/lib/slf4j-api-1.5.11.jar b/integration/lib/slf4j-api-1.5.11.jar
new file mode 100644
index 00000000..ccb8c724
Binary files /dev/null and b/integration/lib/slf4j-api-1.5.11.jar differ
diff --git a/integration/lib/slf4j-api-1.6.99.jar b/integration/lib/slf4j-api-1.6.99.jar
new file mode 100644
index 00000000..a862fba1
Binary files /dev/null and b/integration/lib/slf4j-api-1.6.99.jar differ
diff --git a/integration/lib/slf4j-api-2.0.99.jar b/integration/lib/slf4j-api-2.0.99.jar
new file mode 100644
index 00000000..496af276
Binary files /dev/null and b/integration/lib/slf4j-api-2.0.99.jar differ
diff --git a/integration/lib/slf4j-simple-1.5.11.jar b/integration/lib/slf4j-simple-1.5.11.jar
new file mode 100644
index 00000000..598410ec
Binary files /dev/null and b/integration/lib/slf4j-simple-1.5.11.jar differ
diff --git a/integration/lib/slf4j-simple-1.6.99.jar b/integration/lib/slf4j-simple-1.6.99.jar
new file mode 100644
index 00000000..74707fe5
Binary files /dev/null and b/integration/lib/slf4j-simple-1.6.99.jar differ
diff --git a/integration/lib/slf4j-simple-2.0.99.jar b/integration/lib/slf4j-simple-2.0.99.jar
new file mode 100644
index 00000000..996bcebb
Binary files /dev/null and b/integration/lib/slf4j-simple-2.0.99.jar differ
diff --git a/integration/src/test/java/org/slf4j/VersionMatchTest.java b/integration/src/test/java/org/slf4j/CompatibilityAssertionTest.java
similarity index 87%
rename from integration/src/test/java/org/slf4j/VersionMatchTest.java
rename to integration/src/test/java/org/slf4j/CompatibilityAssertionTest.java
index 4b7a0755..555a5970 100644
--- a/integration/src/test/java/org/slf4j/VersionMatchTest.java
+++ b/integration/src/test/java/org/slf4j/CompatibilityAssertionTest.java
@@ -6,14 +6,13 @@ import java.util.Random;
import junit.framework.TestCase;
-public class VersionMatchTest extends TestCase {
+public class CompatibilityAssertionTest extends TestCase {
-
StringPrintStream sps = new StringPrintStream(System.err);
PrintStream old = System.err;
int diff = 1024 + new Random().nextInt(10000);
- public VersionMatchTest(String name) {
+ public CompatibilityAssertionTest(String name) {
super(name);
}
diff --git a/integration/src/test/java/org/slf4j/MultiBindingTest.java b/integration/src/test/java/org/slf4j/MultiBindingAssertionTest.java
similarity index 95%
rename from integration/src/test/java/org/slf4j/MultiBindingTest.java
rename to integration/src/test/java/org/slf4j/MultiBindingAssertionTest.java
index 3f33c3ec..daa81f9f 100644
--- a/integration/src/test/java/org/slf4j/MultiBindingTest.java
+++ b/integration/src/test/java/org/slf4j/MultiBindingAssertionTest.java
@@ -29,13 +29,13 @@ import java.util.Random;
import junit.framework.TestCase;
-public class MultiBindingTest extends TestCase {
+public class MultiBindingAssertionTest extends TestCase {
StringPrintStream sps = new StringPrintStream(System.err);
PrintStream old = System.err;
int diff = 1024 + new Random().nextInt(10000);
- public MultiBindingTest(String name) {
+ public MultiBindingAssertionTest(String name) {
super(name);
}
diff --git a/integration/src/test/java/org/slf4j/Pre155VersionTest.java b/integration/src/test/java/org/slf4j/Pre155VersionTest.java
deleted file mode 100644
index 02dc11eb..00000000
--- a/integration/src/test/java/org/slf4j/Pre155VersionTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2004-2009 QOS.ch
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package org.slf4j;
-
-import java.io.PrintStream;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-public class Pre155VersionTest extends TestCase {
-
- StringPrintStream sps = new StringPrintStream(System.err);
- PrintStream old = System.err;
- int diff = 1024 + new Random().nextInt(10000);
-
- public Pre155VersionTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- System.setErr(sps);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- System.setErr(old);
- }
-
- public void test() throws Exception {
- Logger logger = LoggerFactory.getLogger(this.getClass());
- String msg = "hello world " + diff;
- logger.info(msg);
- String s0 = (String) sps.stringList.get(0);
- assertTrue(s0.contains(msg));
- }
-}
diff --git a/integration/src/test/java/org/slf4j/VersionMismatchTest.java b/integration/src/test/java/org/slf4j/VersionMismatchAssertionTest.java
similarity index 89%
rename from integration/src/test/java/org/slf4j/VersionMismatchTest.java
rename to integration/src/test/java/org/slf4j/VersionMismatchAssertionTest.java
index d325866d..663428ed 100644
--- a/integration/src/test/java/org/slf4j/VersionMismatchTest.java
+++ b/integration/src/test/java/org/slf4j/VersionMismatchAssertionTest.java
@@ -5,13 +5,13 @@ import java.util.Random;
import junit.framework.TestCase;
-public class VersionMismatchTest extends TestCase {
+public class VersionMismatchAssertionTest extends TestCase {
StringPrintStream sps = new StringPrintStream(System.err);
PrintStream old = System.err;
int diff = 1024 + new Random().nextInt(10000);
- public VersionMismatchTest(String name) {
+ public VersionMismatchAssertionTest(String name) {
super(name);
}
diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
index 2f5c2f3b..96858a90 100644
--- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
@@ -81,11 +81,9 @@ public final class LoggerFactory {
* the compatibility list.
*
*
- * It is assumed that qualifiers after the 3rd digit have no impact on
- * compatibility. Thus, 1.5.7-SNAPSHOT, 1.5.7.RC0 are compatible with 1.5.7.
- */
- static private final String[] API_COMPATIBILITY_LIST = new String[] {
- "1.5.5", "1.5.6", "1.5.7", "1.5.8", "1.5.9", "1.5.10", "1.5.11" };
+ * It is assumed that all versions in the 1.6 are mutually compatible.
+ * */
+ static private final String[] API_COMPATIBILITY_LIST = new String[] { "1.6", "2.0" };
// private constructor prevents instantiation
private LoggerFactory() {
@@ -196,7 +194,8 @@ public final class LoggerFactory {
if (loggerFactoryClassLoader == null) {
paths = ClassLoader.getSystemResources(STATIC_LOGGER_BINDER_PATH);
} else {
- paths = loggerFactoryClassLoader.getResources(STATIC_LOGGER_BINDER_PATH);
+ paths = loggerFactoryClassLoader
+ .getResources(STATIC_LOGGER_BINDER_PATH);
}
List implementationList = new ArrayList();
while (paths.hasMoreElements()) {
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 169b7475..672058eb 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.11"; // !final
+ public static String REQUESTED_API_VERSION = "1.6"; // !final
private StaticLoggerBinder() {
throw new UnsupportedOperationException("This code should have never made it into the jar");
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 9fea2be0..56981b08 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.11";
+ public static String REQUESTED_API_VERSION = "1.6";
// Binding specific code:
private static final String loggerFactoryClassStr = JCLLoggerFactory.class
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 92e9db8d..47afb3fc 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.11"; // !final
+ public static String REQUESTED_API_VERSION = "1.6"; // !final
private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName();
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 2e86c524..37487de2 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.11"; // !final
+ public static String REQUESTED_API_VERSION = "1.6"; // !final
private static final String loggerFactoryClassStr = Log4jLoggerFactory.class
.getName();
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 4c147923..ef15ec3c 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.11"; // !final
+ public static String REQUESTED_API_VERSION = "1.6"; // !final
private static final String loggerFactoryClassStr = NOPLoggerFactory.class.getName();
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 064cb9ee..51370cbf 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.11"; // !final
+ public static String REQUESTED_API_VERSION = "1.6"; // !final
private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName();
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index 82791318..0385121c 100644
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -29,6 +29,11 @@
April Xth, 2010 - Release of SLF4J 1.6.0
+ It is expected that all SLF4J releases in the 1.6.x and
+ 2.0.x series will be mutually compatible. Note that the 2.0.x
+ series is expected to require JDK 1.5 or later.
+
+
Fixed bug 150 by
implementing missing resetConfiguration() and