Author: ceki
Date: Thu Oct 16 17:49:34 2008
New Revision: 1200
Modified:
slf4j/trunk/goVersion.sh
slf4j/trunk/integration/pom.xml
slf4j/trunk/jcl-over-slf4j/pom.xml
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/jul-to-slf4j/pom.xml
slf4j/trunk/log4j-over-slf4j/pom.xml
slf4j/trunk/osgi-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
slf4j/trunk/slf4j-ext/pom.xml
slf4j/trunk/slf4j-jcl/pom.xml
slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
slf4j/trunk/slf4j-log4j12/pom.xml
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
slf4j/trunk/slf4j-migrator/pom.xml
slf4j/trunk/slf4j-nop/pom.xml
slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
slf4j/trunk/slf4j-osgi-integration-test/pom.xml
slf4j/trunk/slf4j-osgi-test-bundle/pom.xml
slf4j/trunk/slf4j-simple/pom.xml
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
slf4j/trunk/slf4j-site/pom.xml
Log:
- preparing release 1.5.4
Modified: slf4j/trunk/goVersion.sh
==============================================================================
--- slf4j/trunk/goVersion.sh (original)
+++ slf4j/trunk/goVersion.sh Thu Oct 16 17:49:34 2008
@@ -1,6 +1,3 @@
-
-
-
VER=$1
echo "Will use version '${VER}'"
echo "Changing pom.xml files"
@@ -8,4 +5,3 @@
echo "Changing Java files"
find . -name "StaticLoggerBinder.java" |xargs perl binderVersion.pl ${VER}
find slf4j-api -name "LoggerFactory.java" |xargs perl binderVersion.pl ${VER}
-
Modified: slf4j/trunk/integration/pom.xml
==============================================================================
--- slf4j/trunk/integration/pom.xml (original)
+++ slf4j/trunk/integration/pom.xml Thu Oct 16 17:49:34 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/jcl-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl-over-slf4j/pom.xml Thu Oct 16 17:49:34 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Thu Oct 16 17:49:34 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/jul-to-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jul-to-slf4j/pom.xml (original)
+++ slf4j/trunk/jul-to-slf4j/pom.xml Thu Oct 16 17:49:34 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/log4j-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/log4j-over-slf4j/pom.xml (original)
+++ slf4j/trunk/log4j-over-slf4j/pom.xml Thu Oct 16 17:49:34 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/osgi-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/osgi-over-slf4j/pom.xml (original)
+++ slf4j/trunk/osgi-over-slf4j/pom.xml Thu Oct 16 17:49:34 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Thu Oct 16 17:49:34 2008
@@ -5,7 +5,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
<packaging>pom</packaging>
<name>SLF4J</name>
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Thu Oct 16 17:49:34 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java Thu Oct
16 17:49:34 2008
@@ -56,7 +56,7 @@
static final String VERSION_MISMATCH =
"http://www.slf4j.org/codes.html#version_mismatch";;
static final String SUBSTITUTE_LOGGER_URL =
"http://www.slf4j.org/codes.html#substituteLogger";;
- static private final String EXPECTED_VERSION = "1.5.4-SNAPSHOT";
+ static private final String EXPECTED_VERSION = "1.5.4";
// private constructor prevents instantiation
private LoggerFactory() {
@@ -76,7 +76,7 @@
loggerFactory = StaticLoggerBinder.SINGLETON.getLoggerFactory();
emitSubstitureLoggerWarning(loggerNameList);
} catch (NoClassDefFoundError ncde) {
- loggerFactory = null; // undo NOPLoggerFactory
+ loggerFactory = null; // undo SubstituteLoggerFactory assignment
String msg = ncde.getMessage();
if (msg != null && msg.indexOf("org/slf4j/impl/StaticLoggerBinder") !=
-1) {
Util
@@ -87,7 +87,7 @@
}
throw ncde;
} catch (Exception e) {
- loggerFactory = null; // undo NOPLoggerFactory
+ loggerFactory = null; // undo SubstituteLoggerFactory assignment
// we should never get here
Util.reportFailure("Failed to instantiate logger ["
+ StaticLoggerBinder.SINGLETON.getLoggerFactoryClassStr() + "]", e);
Modified:
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Thu Oct 16 17:49:34 2008
@@ -48,7 +48,7 @@
* modified with each release.
*/
// to avoid constant folding by the compiler, VERSION field should *not* be
final
- public static String VERSION = "1.5.4-SNAPSHOT"; // !final
+ public static String VERSION = "1.5.4"; // !final
private StaticLoggerBinder() {
throw new UnsupportedOperationException("This code should have never made
it into the jar");
Modified: slf4j/trunk/slf4j-ext/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-ext/pom.xml (original)
+++ slf4j/trunk/slf4j-ext/pom.xml Thu Oct 16 17:49:34 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml (original)
+++ slf4j/trunk/slf4j-jcl/pom.xml Thu Oct 16 17:49:34 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
(original)
+++ slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Thu Oct 16 17:49:34 2008
@@ -55,7 +55,7 @@
* modified with each release.
*/
//to avoid constant folding by the compiler, VERSION field should *not* be
final
- public static String VERSION = "1.5.4-SNAPSHOT";
+ public static String VERSION = "1.5.4";
// Binding specific code:
private static final String loggerFactoryClassStr = JCLLoggerFactory.class
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Thu Oct 16 17:49:34 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
---
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
(original)
+++
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Thu Oct 16 17:49:34 2008
@@ -55,7 +55,7 @@
* modified with each release.
*/
//to avoid constant folding by the compiler, VERSION field should *not* be
final
- public static String VERSION = "1.5.4-SNAPSHOT";
+ public static String VERSION = "1.5.4";
private static final String loggerFactoryClassStr =
org.slf4j.impl.JDK14LoggerFactory.class.getName();
Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml (original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml Thu Oct 16 17:49:34 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
---
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
(original)
+++
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Thu Oct 16 17:49:34 2008
@@ -55,7 +55,7 @@
* Version tag used to check compatibility. The value of this field is
* modified in each release.
*/
- public static final String VERSION = "1.5.4-SNAPSHOT";
+ public static final String VERSION = "1.5.4";
private static final String loggerFactoryClassStr =
Log4jLoggerFactory.class.getName();
Modified: slf4j/trunk/slf4j-migrator/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-migrator/pom.xml (original)
+++ slf4j/trunk/slf4j-migrator/pom.xml Thu Oct 16 17:49:34 2008
@@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Thu Oct 16 17:49:34 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
(original)
+++ slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Thu Oct 16 17:49:34 2008
@@ -55,7 +55,7 @@
* modified with each release.
*/
//to avoid constant folding by the compiler, VERSION field should *not* be
final
- public static String VERSION = "1.5.4-SNAPSHOT";
+ public static String VERSION = "1.5.4";
private static final String loggerFactoryClassStr =
NOPLoggerFactory.class.getName();
Modified: slf4j/trunk/slf4j-osgi-integration-test/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/pom.xml (original)
+++ slf4j/trunk/slf4j-osgi-integration-test/pom.xml Thu Oct 16 17:49:34 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-osgi-test-bundle/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-test-bundle/pom.xml (original)
+++ slf4j/trunk/slf4j-osgi-test-bundle/pom.xml Thu Oct 16 17:49:34 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml (original)
+++ slf4j/trunk/slf4j-simple/pom.xml Thu Oct 16 17:49:34 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
---
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
(original)
+++
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Thu Oct 16 17:49:34 2008
@@ -47,7 +47,7 @@
* modified with each release.
*/
//to avoid constant folding by the compiler, VERSION field should *not* be
final
- public static String VERSION = "1.5.4-SNAPSHOT";
+ public static String VERSION = "1.5.4";
private static final String loggerFactoryClassStr =
SimpleLoggerFactory.class.getName();
Modified: slf4j/trunk/slf4j-site/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-site/pom.xml (original)
+++ slf4j/trunk/slf4j-site/pom.xml Thu Oct 16 17:49:34 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
_______________________________________________
dev mailing list
dev@slf4j.org
http://www.slf4j.org/mailman/listinfo/dev
