- moving to release 1.2-SNAPSHOT

- adding OSGI metadata
2006-12-28 21:20:29 +00:00 · 2006-12-28 21:20:29 +00:00 · ff575fcfab
parent 7de0d05687
commit ff575fcfab
17 changed files with 134 additions and 77 deletions
--- 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>1.1.0</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
@ -29,21 +29,20 @@
  </dependencies>

  <build>
-		<plugins>
-			<plugin>
+    <plugins>		
+      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
-				<configuration>
+        <configuration>
          <archive>
            <manifestEntries>
-              <!-- <Name>org/apache/commons/logging</Name> -->
-              <Implementation-Title>JCL over SLF4J</Implementation-Title>
-              <Implementation-Version>104</Implementation-Version>
-              <Implementation-Vendor>SLF4J.ORG</Implementation-Vendor>
+              <Bundle-Version>${project.version}</Bundle-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
            </manifestEntries>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
          </archive>
-        </configuration>
-			</plugin>
+        </configuration>			
+      </plugin>	
    </plugins>
  </build>

--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@

 	<groupId>org.slf4j</groupId>
 	<artifactId>slf4j-parent</artifactId>
-	<version>1.1.0-RC1</version>
+	<version>1.2-SNAPSHOT</version>

 	<packaging>pom</packaging>
 	<name>SLF4J</name>
@ -26,6 +26,7 @@
    <module>slf4j-log4j12</module>
    <module>slf4j-jcl</module>
    <module>jcl104-over-slf4j</module>
+    <module>slf4j-skin</module>
    <module>slf4j-site</module>
    <module>slf4j-archetype</module>

--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
@ -44,7 +44,16 @@

 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${project.version}</Bundle-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
 				<executions>
 					<execution>
 						<id>bundle-test-jar</id>
--- a/slf4j-archetype/pom.xml
+++ b/slf4j-archetype/pom.xml
@ -2,7 +2,7 @@
  <parent>
    <artifactId>slf4j-parent</artifactId>
    <groupId>org.slf4j</groupId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
  </parent>

  <modelVersion>4.0.0</modelVersion>
--- a/slf4j-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/slf4j-archetype/src/main/resources/archetype-resources/pom.xml
@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j</artifactId>
-		<version>1.1.0</version>
+		<version>1.2-SNAPSHOT</version>
 	</parent>
 	
  <groupId>$groupId</groupId>
--- a/slf4j-jcl/pom.xml
+++ b/slf4j-jcl/pom.xml
@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>1.1.0-RC1</version>
+		<version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
@ -34,6 +34,22 @@
 		</dependency>

  </dependencies>
-
+  
+  <build>
+		<plugins>		
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${project.version}</Bundle-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>			
+      </plugin>	
+    </plugins>

 </project>
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
@ -31,5 +31,22 @@
 		</dependency>
  </dependencies>

+  <build>
+		<plugins>		
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${project.version}</Bundle-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>			
+      </plugin>	
+    </plugins>
+	</build>

 </project>
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
@ -37,5 +37,23 @@
 		</dependency>
  </dependencies>

+  <build>
+    <plugins>		
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${project.version}</Bundle-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>			
+      </plugin>	
+    </plugins>
+	</build>
+

 </project>
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
@ -28,4 +28,23 @@
  </dependencies>


+	<build>
+		<plugins>		
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${project.version}</Bundle-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>			
+      </plugin>	
+    </plugins>
+	</build>
+
+
 </project>
--- a/slf4j-site/pom.xml
+++ b/slf4j-site/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
--- a/slf4j-site/src/site/site.xml
+++ b/slf4j-site/src/site/site.xml
@ -4,7 +4,7 @@
  <skin>
    <groupId>org.slf4j</groupId>
    <artifactId>slf4j-skin</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
  </skin>
  
  <publishDate position="navigation-bottom" format="dd-MM-yyyy"/>
--- a/slf4j-site/src/site/xdocs/download.xml
+++ b/slf4j-site/src/site/xdocs/download.xml
@ -11,13 +11,13 @@

  <h2>Latest official SLF4J version</h2>

-  <p>Download version 1.1.0-RC1 including <i>full source code</i>,
+  <p>Download version 1.1.0 including <i>full source code</i>,
  class files and documentation as
  </p>

  <ul>
-    <li><a href="dist/slf4j-1.1.0-RC1.tar.gz"><b>slf4j-1.1.0-RC1.tar.gz</b></a> </li>
-    <li><a href="dist/slf4j-1.1.0-RC1.zip"><b>slf4j-1.1.0-RC1.zip</b></a> </li>
+    <li><a href="dist/slf4j-1.1.0.tar.gz"><b>slf4j-1.1.0.tar.gz</b></a> </li>
+    <li><a href="dist/slf4j-1.1.0.zip"><b>slf4j-1.1.0.zip</b></a> </li>
    
  </ul>  

--- a/slf4j-site/src/site/xdocs/manual.xml
+++ b/slf4j-site/src/site/xdocs/manual.xml
@ -124,7 +124,7 @@


        <a name="gradual"><h2>Gradual migration to SLF4J from Jakarta
-        Commons Logging (JCL) and/or log4j</h2></a>
+        Commons Logging (JCL)</h2></a>
        
        <h2><em>jcl104-over-slf4j.jar</em></h2>

@ -146,20 +146,10 @@
        the underlying logging system will be done by SLF4J instead of
        JCL but without the class loader headaches. The underlying
        logging system can be any of NOP, simple, jdk14 logging, log4j
-        or LOGBack. Any existing dependency on commons-logging
+        or logback. Any existing dependency on commons-logging
        therefore becomes less of an issue.
        </p>

-        <h2><em>log4j-over-slf4j.jar</em></h2>
-
-        <p>If migrating log4j logging calls to SLF4J is not something
-        you particularly relish, just drop in our implementation of
-        log4j over SLF4J, i.e. <em>log4j-over-slf4j.jar</em>, on your
-        class path. All logging calls made to the log4j API will be
-        redirected to SLF4J which in turn will deletage to the
-        underlying logging system.
-        </p>
-
        <h2><em>slf4j-jcl.jar</em></h2>

        <p>Some of our users after having switched to SLF4J API
@ -204,10 +194,6 @@
        to JCL, resulting in an infinite loop.
        </p>
        
-        <p>For very similar reasons, <em>log4j-over-slf4j.jar</em> and
-        <em>slf4j-log4j12.jar</em> cannot be deployed simultaneously.
-        </p>
-
        <a name="summary"><h2>Summary</h2></a>

        <table class="ls" cellspacing="4" cellpadding="4">
@ -264,11 +250,7 @@
              <em>jcl104-over-slf4j.jar</em>, will allow your project
              to migrate to SLF4J piecemeal, without breaking
              compatibility with existing software using
-              JCL. Similarly, the implementation of log4j's client
-              interface over SLF4J, i.e <em>log4j-over-slf4j.jar</em>,
-              will allow your project to migrate to SLF4J one class at
-              a time, without breaking compatibility with existing
-              legacy logging calls to the log4j API.
+              JCL.
              </p>
            </td>
          </tr>
--- a/slf4j-site/src/site/xdocs/news.xml
+++ b/slf4j-site/src/site/xdocs/news.xml
@ -17,6 +17,31 @@

  <hr noshade="noshade" size="1"/>

+  <h3>December 21st, 2006 - Release of SLF4J 1.1.0 (final)</h3>
+
+  <p>This release consists of minor bug fixes and documentation
+  changes. More importantly, the log4j-over-slf4j module has been
+  moved to the logback project, under the name <a
+  href="http://logback.qos.ch/bridge.html">log4j-bridge</a>.
+  </p> 
+
+   <p>Added the file "org.apache.commons.logging.LogFactory" under
+   META-INF/services directory which went missing in the 1.1.0 series
+   of SLF4J. This fixes a compatibility problem with Apache Axis which
+   uses its own discovery mechanism, namely, commons-discovery version
+   0.2. The problem was reported in bug <a
+   href="http://bugzilla.slf4j.org/show_bug.cgi?id=31">report 31</a>
+   by Martin Gilday.
+  </p>
+
+  <p>The file jcl104-over-slf4j.jar had various entries missing in its
+  MANIFEST.MF file, as reported by Boris Unkel in <a
+  href="http://bugzilla.slf4j.org/show_bug.cgi?id=30">bug number
+  30</a>.
+  </p>
+
+  <hr noshade="noshade" size="1"/>
+
  <h3>November 16th, 2006 - Release of SLF4J 1.1.0-RC1</h3>

  <p>This release consists of packaging related bug fix in addition to
--- a/slf4j-skin/pom.xml
+++ b/slf4j-skin/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
--- a/updateBundle.sh
+++ b/updateBundle.sh
@ -1,29 +0,0 @@
-
-VERSION=1.1.0-RC0
-echo $VERSION
-
-MVN=/java/maven-2.0.4/bin/mvn
-
-update() {
- MODULE=$1
- pushd $MODULE
- $MVN repository:bundle-create 
- echo Maven exited with $?
- if [ $? != 0 ]
- then
-   echo mvn command failed
-   exit 1;
- fi
- scp target/$MODULE-$VERSION-bundle.jar pixie:/var/www/www.slf4j.org/htdocs/dist/bundles/
- popd
-}
-
-update slf4j-api
-update slf4j-archetype
-update slf4j-jcl
-update slf4j-jdk14
-update slf4j-log4j12
-update slf4j-nop
-update slf4j-simple
-update jcl104-over-slf4j
-update log4j-over-slf4j