diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index d5254f52..431f329f 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.1.0 + 1.2-SNAPSHOT 4.0.0 @@ -29,21 +29,20 @@ - - + + org.apache.maven.plugins maven-jar-plugin - + - - JCL over SLF4J - 104 - SLF4J.ORG + ${project.version} + ${project.version} + src/main/resources/META-INF/MANIFEST.MF - - + + diff --git a/pom.xml b/pom.xml index efafaa00..c3f79744 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT pom SLF4J @@ -26,6 +26,7 @@ slf4j-log4j12 slf4j-jcl jcl104-over-slf4j + slf4j-skin slf4j-site slf4j-archetype diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 779d5da9..4475426c 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 @@ -44,7 +44,16 @@ org.apache.maven.plugins - maven-jar-plugin + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + bundle-test-jar diff --git a/slf4j-archetype/pom.xml b/slf4j-archetype/pom.xml index 8aebadbf..cf4f2b61 100644 --- a/slf4j-archetype/pom.xml +++ b/slf4j-archetype/pom.xml @@ -2,7 +2,7 @@ slf4j-parent org.slf4j - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 diff --git a/slf4j-archetype/src/main/resources/archetype-resources/pom.xml b/slf4j-archetype/src/main/resources/archetype-resources/pom.xml index 0cc545aa..33203a6a 100644 --- a/slf4j-archetype/src/main/resources/archetype-resources/pom.xml +++ b/slf4j-archetype/src/main/resources/archetype-resources/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j - 1.1.0 + 1.2-SNAPSHOT $groupId diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index 597b293b..f6e2e7ee 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 @@ -34,6 +34,22 @@ - + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + + \ No newline at end of file diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index ca41c1e4..350f43cc 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 @@ -31,5 +31,22 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + + + \ No newline at end of file diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 019e6a07..9f3ccfbb 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 @@ -37,5 +37,23 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + + + + \ No newline at end of file diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 732fe373..2b2826c1 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 22b16eab..66e4cda7 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 @@ -28,4 +28,23 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + \ No newline at end of file diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 6cd8a9be..c081d31b 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 diff --git a/slf4j-site/src/site/site.xml b/slf4j-site/src/site/site.xml index d702d640..5feaa199 100644 --- a/slf4j-site/src/site/site.xml +++ b/slf4j-site/src/site/site.xml @@ -4,7 +4,7 @@ org.slf4j slf4j-skin - 1.1.0-RC1 + 1.2-SNAPSHOT diff --git a/slf4j-site/src/site/xdocs/download.xml b/slf4j-site/src/site/xdocs/download.xml index 87bcba6f..1d022339 100644 --- a/slf4j-site/src/site/xdocs/download.xml +++ b/slf4j-site/src/site/xdocs/download.xml @@ -11,13 +11,13 @@

Latest official SLF4J version

-

Download version 1.1.0-RC1 including full source code, +

Download version 1.1.0 including full source code, class files and documentation as

diff --git a/slf4j-site/src/site/xdocs/manual.xml b/slf4j-site/src/site/xdocs/manual.xml index 9fed9c87..ca70b4f7 100644 --- a/slf4j-site/src/site/xdocs/manual.xml +++ b/slf4j-site/src/site/xdocs/manual.xml @@ -124,7 +124,7 @@

Gradual migration to SLF4J from Jakarta - Commons Logging (JCL) and/or log4j

 + Commons Logging (JCL)

jcl104-over-slf4j.jar

@@ -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.

-

log4j-over-slf4j.jar

- -

If migrating log4j logging calls to SLF4J is not something - you particularly relish, just drop in our implementation of - log4j over SLF4J, i.e. log4j-over-slf4j.jar, 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. -

-

slf4j-jcl.jar

Some of our users after having switched to SLF4J API @@ -204,10 +194,6 @@ to JCL, resulting in an infinite loop.

-

For very similar reasons, log4j-over-slf4j.jar and - slf4j-log4j12.jar cannot be deployed simultaneously. -

-

Summary

 @@ -264,11 +250,7 @@ jcl104-over-slf4j.jar, 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 log4j-over-slf4j.jar, - 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.

diff --git a/slf4j-site/src/site/xdocs/news.xml b/slf4j-site/src/site/xdocs/news.xml index 9c51a623..2dc998bd 100644 --- a/slf4j-site/src/site/xdocs/news.xml +++ b/slf4j-site/src/site/xdocs/news.xml @@ -17,6 +17,31 @@
+

December 21st, 2006 - Release of SLF4J 1.1.0 (final)

+ +

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 log4j-bridge. +

+ +

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 report 31 + by Martin Gilday. +

+ +

The file jcl104-over-slf4j.jar had various entries missing in its + MANIFEST.MF file, as reported by Boris Unkel in bug number + 30. +

+ +
+

November 16th, 2006 - Release of SLF4J 1.1.0-RC1

This release consists of packaging related bug fix in addition to diff --git a/slf4j-skin/pom.xml b/slf4j-skin/pom.xml index 00b50614..aabbc110 100644 --- a/slf4j-skin/pom.xml +++ b/slf4j-skin/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.1.0-RC1 + 1.2-SNAPSHOT 4.0.0 diff --git a/updateBundle.sh b/updateBundle.sh deleted file mode 100644 index 35afb330..00000000 --- a/updateBundle.sh +++ /dev/null @@ -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 \ No newline at end of file