From 96d32b3b6603e75aa4c92496a59b111f8dbda5eb Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Thu, 3 Dec 2015 19:31:23 +0100 Subject: [PATCH] revert REQUESTED_API_VERSION to 1.6.99 --- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index de74d1f0..89d4addc 100644 --- a/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -56,7 +56,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final 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 c60018cc..55d54813 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final private StaticLoggerBinder() { throw new UnsupportedOperationException("This code should have never made it into slf4j-api.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 011a9437..84074cad 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -55,7 +55,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final // Binding specific code: 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 c7375cd1..74c18936 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -56,7 +56,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !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 a14ca119..2ed8c6ef 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,7 +58,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !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 90b13c7f..35fc464d 100644 --- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !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 e3859f34..23b6c874 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName();