Author: ceki
Date: Sun Feb 25 17:18:57 2007
New Revision: 762
Removed:
slf4j/trunk/slf4j-site/src/site/site.xml
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/osgi-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-archetype/pom.xml
slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/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-osgi-integration-test/pom.xml
slf4j/trunk/slf4j-osgi-test-bundle/pom.xml
slf4j/trunk/slf4j-simple/pom.xml
slf4j/trunk/slf4j-site/pom.xml
slf4j/trunk/slf4j-site/src/site/resources/css/site.css
slf4j/trunk/slf4j-site/src/site/resources/faq.html
slf4j/trunk/slf4j-site/src/site/resources/news.html
slf4j/trunk/src/main/assembly/source.xml
Log:
- Renamed the "project_version_for_osgi" property as pv4osgi
- Preparing release 1.3.0
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Sun Feb 25 17:18:57 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</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 Sun Feb 25 17:18:57 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Sun Feb 25 17:18:57 2007
@@ -5,7 +5,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<packaging>pom</packaging>
<name>SLF4J</name>
@@ -19,7 +19,8 @@
<inceptionYear>2005</inceptionYear>
<properties>
- <project_version_for_osgi>1.3.0.SNAPSHOT</project_version_for_osgi>
+ <!-- <project_version_for_osgi>1.3.0</project_version_for_osgi> -->
+ <pv4osgi>1.3.0</pv4osgi>
</properties>
<modules>
@@ -50,6 +51,13 @@
</dependencyManagement>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Sun Feb 25 17:18:57 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -45,7 +45,7 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+ <Bundle-Version>${pv4osgi}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
Modified: slf4j/trunk/slf4j-archetype/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-archetype/pom.xml (original)
+++ slf4j/trunk/slf4j-archetype/pom.xml Sun Feb 25 17:18:57 2007
@@ -2,7 +2,7 @@
<parent>
<artifactId>slf4j-parent</artifactId>
<groupId>org.slf4j</groupId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/pom.xml
Sun Feb 25 17:18:57 2007
@@ -8,7 +8,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<groupId>$groupId</groupId>
Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml (original)
+++ slf4j/trunk/slf4j-jcl/pom.xml Sun Feb 25 17:18:57 2007
@@ -1,58 +1,58 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <parent>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>${parent.version}</version>
- <packaging>jar</packaging>
- <name>SLF4J JCL Binding</name>
-
- <url>http://www.slf4j.org</url>
-
- <description>
- The slf4j jcl binding
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
- <Bundle-Description>${project.description}</Bundle-Description>
-
<Implementation-Version>${project.version}</Implementation-Version>
- </manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-parent</artifactId>
+ <version>1.3.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>${parent.version}</version>
+ <packaging>jar</packaging>
+ <name>SLF4J JCL Binding</name>
+
+ <url>http://www.slf4j.org</url>
+
+ <description>
+ The slf4j jcl binding
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Description>${project.description}</Bundle-Description>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Sun Feb 25 17:18:57 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,7 +49,7 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+ <Bundle-Version>${pv4osgi}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml (original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml Sun Feb 25 17:18:57 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -45,7 +45,7 @@
<configuration>
<archive>
<manifestEntries>
-
<Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+ <Bundle-Version>${pv4osgi}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Sun Feb 25 17:18:57 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+ <Bundle-Version>${pv4osgi}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
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 Sun Feb 25 17:18:57 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</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 Sun Feb 25 17:18:57 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</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 Sun Feb 25 17:18:57 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,6 +27,13 @@
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -34,7 +41,7 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+ <Bundle-Version>${pv4osgi}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
Modified: slf4j/trunk/slf4j-site/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-site/pom.xml (original)
+++ slf4j/trunk/slf4j-site/pom.xml Sun Feb 25 17:18:57 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-site/src/site/resources/css/site.css
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/resources/css/site.css (original)
+++ slf4j/trunk/slf4j-site/src/site/resources/css/site.css Sun Feb 25
17:18:57 2007
@@ -20,6 +20,10 @@
/*padding: 5px 20px 5px 20px; */
}
+p.rm {
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
a {
color: #0000CC;
Modified: slf4j/trunk/slf4j-site/src/site/resources/faq.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/resources/faq.html (original)
+++ slf4j/trunk/slf4j-site/src/site/resources/faq.html Sun Feb 25 17:18:57 2007
@@ -311,12 +311,14 @@
</dt>
<dd>
- <p>As a library author built with Maven2, you might want to
- test your application using a binding, say slf4j-simple or
- slf4j-log4j12, without exporting that dependency to your
- users. But first, since your library's code depends on the
- SLF4J API you will need to declare slf4j-api as a
- compile-time (default scope) dependency.
+ <p>As an author of a library built with Maven2, you might
+ want to test your application using a binding, say
+ slf4j-log4j12 or logback-classic, without forcing log4j or
+ logback-classic as a dependency on your users. As of SLF4J
+ version 1.3, this quite very easy to accomplish. But first,
+ since your library's code depends on the SLF4J API you will
+ need to declare slf4j-api as a compile-time (default scope)
+ dependency.
</p>
<p> </p>
<p class="source"><dependency>
@@ -327,9 +329,9 @@
<p> </p>
- <p>Limiting the transitivity of the binding you are using for
- your test is as easy as declaring the scope of the dependency
- as "test". Here is an example:</p>
+ <p>Limiting the transitivity of the SLF4J binding used in your
+ tests can be easily accomplished by declaring the scope of the
+ SLF4J-binding dependency as "test". Here is an example:</p>
<p> </p>
@@ -340,7 +342,10 @@
<b><scope>test</scope></b>
</dependency></p>
-
+ <p>Thus, as far as your users are concerned you are exporting
+ slf4j-api as a transitive dependency of your library, but not
+ any SLF4J-binding or an underlying logging system.
+ </p>
</dd>
Modified: slf4j/trunk/slf4j-site/src/site/resources/news.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/resources/news.html (original)
+++ slf4j/trunk/slf4j-site/src/site/resources/news.html Sun Feb 25 17:18:57 2007
@@ -36,8 +36,9 @@
<code>org.slf4j.LoggerFactory</code> class is now packaged within
the <em>slf4j-api.jar</em> file instead of the various slf4j
bindings. It follows that client code needs to depend on only
- slf4j-api in order to compile, while the various slf4j bindinds
- are only neded as runtime dependencies.
+ slf4j-api in order to compile, while the various slf4j bindinds are
+ only neded as runtime dependencies. See also the <a
+ href="faq.html#maven2">Maven2-related FAQ entry</a>.
</p>
<p><a href="http://bugzilla.slf4j.org/show_bug.cgi?id=23";>Bug
Modified: slf4j/trunk/src/main/assembly/source.xml
==============================================================================
--- slf4j/trunk/src/main/assembly/source.xml (original)
+++ slf4j/trunk/src/main/assembly/source.xml Sun Feb 25 17:18:57 2007
@@ -70,6 +70,22 @@
</includes>
</fileSet>
+ <fileSet>
+ <directory>slf4j-site/</directory>
+ <outputDirectory>slf4j-site/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-archetype/</directory>
+ <outputDirectory>slf4j-archetype/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
<!-- Module Source directories (includes tests) -->
<fileSet>
<directory>slf4j-api/src/</directory>
@@ -100,6 +116,10 @@
<outputDirectory>slf4j-nop/src/</outputDirectory>
</fileSet>
<fileSet>
+ <directory>slf4j-simple/src/</directory>
+ <outputDirectory>slf4j-simple/src/</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>slf4j-jcl/src/</directory>
<outputDirectory>slf4j-jcl/src/</outputDirectory>
</fileSet>
@@ -111,6 +131,15 @@
<directory>log4j-over-slf4j/src/</directory>
<outputDirectory>log4j-over-slf4j/src/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>slf4j-site/src/</directory>
+ <outputDirectory>slf4j-site/src/</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-archetype/src/</directory>
+ <outputDirectory>slf4j-archetype/src/</outputDirectory>
+ </fileSet>
<!-- Module JARs -->
<fileSet>
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
