- fixed test scope issue in log4j-over-slf4j

- setting version number to 1.5.8 - updating news
twwwt · Jun 11, 2009 · 6501841 · 6501841
1 parent 88b4eaa
commit 6501841
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 25 deletions.
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>2.0.0-SNAPSHOT</version>
+    	<version>1.5.8</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git 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>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git 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>2.0.0-SNAPSHOT</version>
+    	<version>1.5.8</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git 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>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -41,6 +41,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
     </dependency>  
   </dependencies>
 

diff --git 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>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.slf4j</groupId>
 	<artifactId>slf4j-parent</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>1.5.8</version>
 
 	<packaging>pom</packaging>
 	<name>SLF4J</name>

diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
@@ -84,7 +84,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.5", "1.5.6", "1.5.7", "1.5.8" };
 
   // private constructor prevents instantiation
   private LoggerFactory() {

diff --git 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 static final StaticLoggerBinder getSingleton() {
    * 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 = "2.0.0";  // !final
+  public static String REQUESTED_API_VERSION = "1.5.8";  // !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
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>1.5.8</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
@@ -65,7 +65,7 @@ public static final StaticLoggerBinder getSingleton() {
    */ 
 
   //to avoid constant folding by the compiler, this field must *not* be final
-  public static String REQUESTED_API_VERSION = "2.0.0";  
+  public static String REQUESTED_API_VERSION = "1.5.8";  
 
   // Binding specific code:
   private static final String loggerFactoryClassStr = JCLLoggerFactory.class

diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>2.0.0-SNAPSHOT</version>
+    	<version>1.5.8</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
@@ -66,7 +66,7 @@ public static final StaticLoggerBinder getSingleton() {
    * 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 = "2.0.0";  // !final
+  public static String REQUESTED_API_VERSION = "1.5.8";  // !final
 
 
   private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName();

diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>1.5.8</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
@@ -66,7 +66,7 @@ public static final StaticLoggerBinder getSingleton() {
    * 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 = "2.0.0"; // !final
+  public static String REQUESTED_API_VERSION = "1.5.8"; // !final
 
   private static final String loggerFactoryClassStr = Log4jLoggerFactory.class
       .getName();

diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 	  <groupId>org.slf4j</groupId>
       <artifactId>slf4j-parent</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>1.5.8</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>2.0.0-SNAPSHOT</version>
+    	<version>1.5.8</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
@@ -66,7 +66,7 @@ public static final StaticLoggerBinder getSingleton() {
    * 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 = "2.0.0";  // !final
+  public static String REQUESTED_API_VERSION = "1.5.8";  // !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
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>1.5.8</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git 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>2.0.0-SNAPSHOT</version>
+		<version>1.5.8</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</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
@@ -58,7 +58,7 @@ public static final StaticLoggerBinder getSingleton() {
    * 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 = "2.0.0";  // !final
+  public static String REQUESTED_API_VERSION = "1.5.8";  // !final
 
   private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName();
 

diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.5.8</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
@@ -27,6 +27,18 @@ <h1>SLF4J News</h1>
 
   <hr noshade="noshade" size="1"/>
 
+  <h3>June 11th, 2009 - Release of SLF4J 1.5.8</h3>
+
+  <p>SLF4J version 1.5.8 consist of bug fixes. It is totally backward
+  compatible with SLF4J version 1.5.7.</p>
+
+  <p>The Maven pom file for the <code>log4j-over-slf4j</code> module
+  contained a compile time dependency on the <code>slf4j-jdk14</code>
+  module. The dependency should have been declared in the test
+  scope. This problem was reported by Jean-Luc Geering on the slf4j
+  user list.
+  </p>
+
   <h3>June 10th, 2009 - Release of SLF4J 1.5.7</h3>
 
   <p>SLF4J version 1.5.7 consist of bug fixes and minor