[slf4j-dev] svn commit: r664 - in slf4j/trunk: . jcl104-over-slf4j log4j-over-slf4j slf4j-api slf4j-archetype slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-nop slf4j-simple slf4j-site slf4j-site/src/site slf4j-site/src/site/fml slf4j-site/src/site/xdocs slf4j-skin src/main/assembly
ceki at slf4j.org
ceki at slf4j.org
Thu Nov 16 23:54:31 CET 2006
Author: ceki
Date: Thu Nov 16 23:54:30 2006
New Revision: 664
Added:
slf4j/trunk/version.pl
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/log4j-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-archetype/pom.xml
slf4j/trunk/slf4j-jcl/pom.xml
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-log4j12/pom.xml
slf4j/trunk/slf4j-nop/pom.xml
slf4j/trunk/slf4j-simple/pom.xml
slf4j/trunk/slf4j-site/pom.xml
slf4j/trunk/slf4j-site/src/site/fml/faq.fml
slf4j/trunk/slf4j-site/src/site/site.xml
slf4j/trunk/slf4j-site/src/site/xdocs/docs.xml
slf4j/trunk/slf4j-site/src/site/xdocs/manual.xml
slf4j/trunk/slf4j-site/src/site/xdocs/news.xml
slf4j/trunk/slf4j-skin/pom.xml
slf4j/trunk/src/main/assembly/source.xml
Log:
- Since SLF4J is published on ibiblio, slf4j-parent pom is no longer a SNAPSHOT
- preparing release 1.1.0-RC1
- minor doc changes
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Thu Nov 16 23:54:30 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>JCL Implemented Over SLF4J</name>
Modified: slf4j/trunk/log4j-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/log4j-over-slf4j/pom.xml (original)
+++ slf4j/trunk/log4j-over-slf4j/pom.xml Thu Nov 16 23:54:30 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>Log4j Implemented Over SLF4J</name>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Thu Nov 16 23:54:30 2006
@@ -5,17 +5,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
<packaging>pom</packaging>
<name>SLF4J</name>
<url>http://www.slf4j.org</url>
- <properties>
- <aversion>1.1.0-RC0</aversion>
- </properties>
-
<organization>
<name>QOS.ch</name>
<url>http://www.qos.ch</url>
@@ -156,12 +152,21 @@
src/main/assembly/source.xml
</descriptor>
</descriptors>
- <finalName>slf4j-${aversion}</finalName>
+ <finalName>slf4j-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<outputDirectory>target/site/dist/</outputDirectory>
</configuration>
</plugin>
-
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <javadocDir>target/site/apidocs/</javadocDir>
+ <linkJavadoc>true</linkJavadoc>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Thu Nov 16 23:54:30 2006
@@ -6,14 +6,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>SLF4J API Module</name>
Modified: slf4j/trunk/slf4j-archetype/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-archetype/pom.xml (original)
+++ slf4j/trunk/slf4j-archetype/pom.xml Thu Nov 16 23:54:30 2006
@@ -2,7 +2,7 @@
<parent>
<artifactId>slf4j-parent</artifactId>
<groupId>org.slf4j</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@
<artifactId>slf4j-archetype</artifactId>
<name>Archetype - slf4j-archetype</name>
<packaging>jar</packaging>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<url>http://www.slf4j.org</url>
Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml (original)
+++ slf4j/trunk/slf4j-jcl/pom.xml Thu Nov 16 23:54:30 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>SLF4J JCL Binding</name>
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Thu Nov 16 23:54:30 2006
@@ -6,14 +6,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>SLF4J JDK14 Binding</name>
Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml (original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml Thu Nov 16 23:54:30 2006
@@ -6,14 +6,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>SLF4J LOG4J-12 Binding</name>
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Thu Nov 16 23:54:30 2006
@@ -6,14 +6,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>SLF4J NOP Binding</name>
Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml (original)
+++ slf4j/trunk/slf4j-simple/pom.xml Thu Nov 16 23:54:30 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>SLF4J Simple Binding</name>
Modified: slf4j/trunk/slf4j-site/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-site/pom.xml (original)
+++ slf4j/trunk/slf4j-site/pom.xml Thu Nov 16 23:54:30 2006
@@ -5,14 +5,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-site</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>pom</packaging>
<name>SLF4J Site</name>
Modified: slf4j/trunk/slf4j-site/src/site/fml/faq.fml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/fml/faq.fml (original)
+++ slf4j/trunk/slf4j-site/src/site/fml/faq.fml Thu Nov 16 23:54:30 2006
@@ -154,14 +154,14 @@
<em>slf4j-simple.jar</em>, <em>slf4j-log4j12.jar</em>,
<em>slf4j-log4j13.jar</em> and <em>slf4j-jdk14.jar</em>. These
files ship with the <a href="download.html">official SLF4J
- distribution.</a>
+ distribution</a>. Please note that all binding depend on
+ <em>slf4j-api.jar</em>.
</p>
- <p>The binding for NLOG4J ships with the <a
- href="http://www.slf4j.org/nlog4j/download.html">NLOG4J
- distribution</a>. If you use NLOG4J, you don't need to load
- SLF4J because NLOG4J 1.2.10 and later already contain the
- SLF4J interfaces and classes.
+ <p>The binding for logback-classic ships with the <a
+ href="http://logback.qos.ch/download.html">logback
+ distribution</a>. However, as with all other bindings, the
+ logback-classic binding requires <em>slf4j-api.jar</em>.
</p>
</answer>
</faq>
@@ -476,6 +476,7 @@
</faq>
+ <!--
<faq id="log4j_12_vs_13">
<question>
What is the difference between
@@ -499,6 +500,7 @@
</answer>
</faq>
+
<faq id="nlog4j_or_log4j">
<question>
NLOG4J or log4j, which one should I choose?
@@ -543,6 +545,8 @@
</p>
</answer>
</faq>
+-->
+
</part>
<part>
Modified: slf4j/trunk/slf4j-site/src/site/site.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/site.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/site.xml Thu Nov 16 23:54:30 2006
@@ -4,7 +4,7 @@
<skin>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-skin</artifactId>
- <version>1.1.0-RC0</version>
+ <version>1.1.0-RC1</version>
</skin>
<publishDate position="navigation-bottom" format="dd-MM-yyyy"/>
Modified: slf4j/trunk/slf4j-site/src/site/xdocs/docs.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/xdocs/docs.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/xdocs/docs.xml Thu Nov 16 23:54:30 2006
@@ -16,6 +16,7 @@
<ul>
<li><a href="manual.html">User manual</a></li>
<li><a href="api/index.html">javadocs</a></li>
+ <li><a href="xref/index.html">sources</a></li>
<li><a href="faq.html">FAQ</a></li>
</ul>
Modified: slf4j/trunk/slf4j-site/src/site/xdocs/manual.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/xdocs/manual.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/xdocs/manual.xml Thu Nov 16 23:54:30 2006
@@ -49,18 +49,6 @@
<h2>Swapping implementations at deployment time</h2>
- <p>SLF4J currently supports multiple implementations, namely,
- NOP, Simple, log4j version 1.2, log4j version 1.3, NLOG4J, JDK
- 1.4 logging, JCL and LOGBack. The SLF4J distribution ships
- with several jar files <em>slf4j-nop.jar</em>,
- <em>slf4j-simple.jar</em>, <em>slf4j-log4j12.jar</em>,
- <em>slf4j-log4j13.jar</em>, <em>slf4j-jdk14.jar</em> and
- <em>slf4j-jcl.jar</em>. Each of these jar files is hardwired
- <em>at compile-time</em> to use just one implementation, that
- is NOP, Simple, log4j version 1.2, log4j version 1.3, JDK 1.4
- logging, JCL and LOGBack, respectively.
- </p>
-
<p>SLF4J supports multiple logging systems, namely, NOP,
Simple, log4j version 1.2, log4j version 1.3, JDK 1.4 logging,
JCL and logback. The SLF4J distribution ships with several jar
@@ -69,17 +57,17 @@
<em>slf4j-jdk14.jar</em> and <em>slf4j-jcl.jar</em>. Each of
these jar files is hardwired <em>at compile-time</em> to use
just one implementation, that is NOP, Simple, log4j version
- 1.2, log4j version 1.3, JDK 1.4 logging, JCL and logback,
- respectively. As of version SLF4J 1.1.0, all of the bindings
- shipped with SLF4J depend on <em>slf4j-api.jar</em> which must
- be present on the class path for the binding to function
- properly.
+ 1.2, log4j version 1.3, JDK 1.4 logging, and repectively
+ JCL. <span style="color:#D22">As of version SLF4J 1.1.0, all of the
+ bindings shipped with SLF4J depend on <em>slf4j-api.jar</em>
+ which must be present on the class path for the binding to
+ function properly.</span>
</p>
<h2>Small applications</h2>
<p>Small applications where configuring a fully-fledged
- logging systems can be somewhat of an overkill can drop in
+ logging systems can be somewhat of an overkill, can drop in
<em>slf4j-simple.jar</em> instead of a binding for the
fully-fledged logging system.
</p>
Modified: slf4j/trunk/slf4j-site/src/site/xdocs/news.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/xdocs/news.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/xdocs/news.xml Thu Nov 16 23:54:30 2006
@@ -17,6 +17,22 @@
<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
+ minor documentation changes.
+ </p>
+
+ <p>Contrary to RC0, RC1 no longer uses SNAPSHOT versions for the
+ slf4j-parent pom. The solution to <a
+ href="http://ceki.blogspot.com/2006/11/solution-to-maven2-version-number.html">Maven
+ version problem</a> does not work for public projects such as SLF4J
+ because SNAPHOTs are not allowed on ibiblio.
+ </p>
+
+
+ <hr noshade="noshade" size="1"/>
+
<h3>November 4th, 2006 - Release of SLF4J 1.1.0-RC0</h3>
<p>This release consists of bug fixes. Moreover, since the major
Modified: slf4j/trunk/slf4j-skin/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-skin/pom.xml (original)
+++ slf4j/trunk/slf4j-skin/pom.xml Thu Nov 16 23:54:30 2006
@@ -5,14 +5,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-skin</artifactId>
- <version>${aversion}</version>
+ <version>${parent.version}</version>
<packaging>jar</packaging>
<name>SLF4J Website Skin</name>
Modified: slf4j/trunk/src/main/assembly/source.xml
==============================================================================
--- slf4j/trunk/src/main/assembly/source.xml (original)
+++ slf4j/trunk/src/main/assembly/source.xml Thu Nov 16 23:54:30 2006
@@ -117,8 +117,8 @@
<directory>slf4j-api/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>slf4j-api-${aversion}-sources.jar</include>
- <include>slf4j-api-${aversion}.jar</include>
+ <include>slf4j-api-${project.version}-sources.jar</include>
+ <include>slf4j-api-${project.version}.jar</include>
</includes>
</fileSet>
@@ -126,8 +126,8 @@
<directory>slf4j-jcl/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>slf4j-jcl-${aversion}.jar</include>
- <include>slf4j-jcl-${aversion}-sources.jar</include>
+ <include>slf4j-jcl-${project.version}.jar</include>
+ <include>slf4j-jcl-${project.version}-sources.jar</include>
</includes>
</fileSet>
@@ -135,8 +135,8 @@
<directory>slf4j-jdk14/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>slf4j-jdk14-${aversion}-sources.jar</include>
- <include>slf4j-jdk14-${aversion}.jar</include>
+ <include>slf4j-jdk14-${project.version}-sources.jar</include>
+ <include>slf4j-jdk14-${project.version}.jar</include>
</includes>
</fileSet>
@@ -144,8 +144,8 @@
<directory>slf4j-log4j12/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>slf4j-log4j12-${aversion}.jar</include>
- <include>slf4j-log4j12-${aversion}-sources.jar</include>
+ <include>slf4j-log4j12-${project.version}.jar</include>
+ <include>slf4j-log4j12-${project.version}-sources.jar</include>
</includes>
</fileSet>
@@ -153,8 +153,8 @@
<directory>slf4j-nop/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>slf4j-nop-${aversion}.jar</include>
- <include>slf4j-nop-${aversion}-sources.jar</include>
+ <include>slf4j-nop-${project.version}.jar</include>
+ <include>slf4j-nop-${project.version}-sources.jar</include>
</includes>
</fileSet>
@@ -162,8 +162,8 @@
<directory>slf4j-simple/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>slf4j-simple-${aversion}-sources*.jar</include>
- <include>slf4j-simple-${aversion}.jar</include>
+ <include>slf4j-simple-${project.version}-sources*.jar</include>
+ <include>slf4j-simple-${project.version}.jar</include>
</includes>
</fileSet>
@@ -171,16 +171,16 @@
<directory>jcl104-over-slf4j/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>jcl104-over-slf4j-${aversion}-sources.jar</include>
- <include>jcl104-over-slf4j-${aversion}.jar</include>
+ <include>jcl104-over-slf4j-${project.version}-sources.jar</include>
+ <include>jcl104-over-slf4j-${project.version}.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>log4j-over-slf4j/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>log4j-over-slf4j-${aversion}.jar</include>
- <include>log4j-over-slf4j-${aversion}-sources.jar</include>
+ <include>log4j-over-slf4j-${project.version}.jar</include>
+ <include>log4j-over-slf4j-${project.version}-sources.jar</include>
</includes>
</fileSet>
Added: slf4j/trunk/version.pl
==============================================================================
--- (empty file)
+++ slf4j/trunk/version.pl Thu Nov 16 23:54:30 2006
@@ -0,0 +1,43 @@
+
+if ($#ARGV < 1) {
+ print "Usage: version.pl VER FILE {FILE, FILE}\n";
+ exit;
+}
+
+$V= $ARGV[0];
+print "VER:$V\r\n";
+shift(@ARGV);
+
+sub replace () {
+ my $filename = $_[0];
+
+ if(-s $filename) {
+ print "Processing [" . $filename . "]\r\n";
+
+ my $backup = "$filename.original";
+
+ rename($filename, $backup);
+ open(OUT, ">$filename");
+ open(IN, "$backup");
+
+ my $hitCount=0;
+ while(<IN>) {
+ if($hitCount == 0 && /<version>.*<\/version>/) {
+ s/<version>.*<\/version>/<version>$V<\/version>/;
+ $hitCount++;
+ }
+ print OUT;
+ }
+ close(IN);
+ close(OUT);
+ } else {
+ print "File [" . $filename . "] does not exist\r\n"
+ }
+}
+
+foreach $ARG (@ARGV) {
+ do replace($ARG);
+}
+
+
+
More information about the slf4j-dev
mailing list