[slf4j-dev] svn commit: r712 - in slf4j/trunk: . jcl104-over-slf4j jcl104-over-slf4j/src/main/resources/META-INF slf4j-api slf4j-api/src/main/resources/META-INF slf4j-archetype slf4j-jcl slf4j-jcl/src/main/resources/META-INF slf4j-jdk14 slf4j-jdk14/src/main/resources/META-INF slf4j-log4j12 slf4j-log4j12/src/main/resources/META-INF slf4j-nop slf4j-nop/src/main/resources/META-INF slf4j-osgi-test-bundle slf4j-osgi-test-bundle/src/main/resources/META-INF slf4j-simple slf4j-simple/src/main/resources/META-INF slf4j-site slf4j-skin
John E. Conlon
jconlon at verticon.com
Tue Feb 6 17:36:39 CET 2007
Not sure the prefered way to specify to maven where to find the plugin (
pom, local or global settings?). So I did not add this to pom.xml.
Here is where is where the plugin can be found:
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<name>Apache Snapshot Plugin Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
cheers,
John
jconlon at slf4j.org wrote:
> Author: jconlon
> Date: Tue Feb 6 17:13:54 2007
> New Revision: 712
>
> Removed:
> slf4j/trunk/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
> slf4j/trunk/slf4j-api/src/main/resources/META-INF/
> slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/
> slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/
> slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/
> slf4j/trunk/slf4j-nop/src/main/resources/META-INF/
> slf4j/trunk/slf4j-osgi-test-bundle/src/main/resources/META-INF/
> slf4j/trunk/slf4j-simple/src/main/resources/META-INF/
> Modified:
> slf4j/trunk/jcl104-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-osgi-test-bundle/pom.xml
> slf4j/trunk/slf4j-simple/pom.xml
> slf4j/trunk/slf4j-site/pom.xml
> slf4j/trunk/slf4j-skin/pom.xml
>
> Log:
> Replaced maven-jar-plugin with the org.apache.felix.maven-bundle-plugin for the
> creation of OSGi compatible jars.
> Changed multiproject version to 1.3.0-SNAPSHOT to adhere to maven and OSGi
> conventions.
> Packages from the sl4fj-api project are now copied at build time by the
> org.apache.felix.maven-bundle-plugin to all SLF4J Binding projects.
>
>
> Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
> ==============================================================================
> --- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
> +++ slf4j/trunk/jcl104-over-slf4j/pom.xml Tue Feb 6 17:13:54 2007
> @@ -3,7 +3,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -11,7 +11,7 @@
> <groupId>org.slf4j</groupId>
> <artifactId>jcl104-over-slf4j</artifactId>
> <version>${parent.version}</version>
> - <packaging>jar</packaging>
> + <packaging>bundle</packaging>
> <name>JCL Implemented Over SLF4J</name>
>
> <url>http://www.slf4j.org</url>
> @@ -30,19 +30,20 @@
>
> <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>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Export-Package>
> + org.apache.commons.logging;version=1.0.4
> + </Export-Package>
> + <Private-Package>org.apache.commons.logging.impl</Private-Package>
> + <Import-Package>org.slf4j;version="[1.3,1.4)"</Import-Package>
> + </instructions>
> + </configuration>
> + </plugin>
> </plugins>
> </build>
>
>
> Modified: slf4j/trunk/pom.xml
> ==============================================================================
> --- slf4j/trunk/pom.xml (original)
> +++ slf4j/trunk/pom.xml Tue Feb 6 17:13:54 2007
> @@ -5,7 +5,7 @@
>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
>
> <packaging>pom</packaging>
> <name>SLF4J</name>
>
> Modified: slf4j/trunk/slf4j-api/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-api/pom.xml (original)
> +++ slf4j/trunk/slf4j-api/pom.xml Tue Feb 6 17:13:54 2007
> @@ -6,7 +6,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -44,17 +44,7 @@
>
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> - <configuration>
> - <archive>
> - <manifestEntries>
> - <Bundle-Version>1.3.0.SNAPSHOT</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>
> + <artifactId>maven-jar-plugin</artifactId>
> <executions>
> <execution>
> <id>bundle-test-jar</id>
>
> Modified: slf4j/trunk/slf4j-archetype/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-archetype/pom.xml (original)
> +++ slf4j/trunk/slf4j-archetype/pom.xml Tue Feb 6 17:13:54 2007
> @@ -2,7 +2,7 @@
> <parent>
> <artifactId>slf4j-parent</artifactId>
> <groupId>org.slf4j</groupId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
>
> Modified: slf4j/trunk/slf4j-jcl/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-jcl/pom.xml (original)
> +++ slf4j/trunk/slf4j-jcl/pom.xml Tue Feb 6 17:13:54 2007
> @@ -3,7 +3,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -11,7 +11,7 @@
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-jcl</artifactId>
> <version>${parent.version}</version>
> - <packaging>jar</packaging>
> + <packaging>bundle</packaging>
> <name>SLF4J JCL Binding</name>
>
> <url>http://www.slf4j.org</url>
> @@ -37,19 +37,22 @@
>
> <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>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Export-Package>
> + org.slf4j;version=1.3
> + </Export-Package>
> + <Private-Package>
> + org.slf4j.impl, org.slf4j.spi
> + </Private-Package>
> + <Import-Package>!org.slf4j.*,!org.apache.avalon.framework.logger,*</Import-Package>
> + </instructions>
> + </configuration>
> + </plugin>
> </plugins>
> </build>
>
>
> Modified: slf4j/trunk/slf4j-jdk14/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-jdk14/pom.xml (original)
> +++ slf4j/trunk/slf4j-jdk14/pom.xml Tue Feb 6 17:13:54 2007
> @@ -6,7 +6,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -15,7 +15,7 @@
> <artifactId>slf4j-jdk14</artifactId>
> <version>${parent.version}</version>
>
> - <packaging>jar</packaging>
> + <packaging>bundle</packaging>
> <name>SLF4J JDK14 Binding</name>
>
> <url>http://www.slf4j.org</url>
> @@ -32,31 +32,34 @@
> </dependencies>
>
> <build>
> - <plugins>
> + <plugins>
>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-compiler-plugin</artifactId>
> <configuration>
> - <source>1.4</source>
> - <target>1.4</target>
> + <source>1.4</source>
> + <target>1.4</target>
> </configuration>
> </plugin>
>
> - <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>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Export-Package>
> + org.slf4j;version=1.3
> + </Export-Package>
> + <Private-Package>
> + org.slf4j.impl, org.slf4j.spi
> + </Private-Package>
> + <Import-Package>!org.slf4j.*</Import-Package>
> + </instructions>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
>
> </project>
> \ No newline at end of file
>
> Modified: slf4j/trunk/slf4j-log4j12/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-log4j12/pom.xml (original)
> +++ slf4j/trunk/slf4j-log4j12/pom.xml Tue Feb 6 17:13:54 2007
> @@ -6,7 +6,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -14,7 +14,7 @@
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-log4j12</artifactId>
> <version>${parent.version}</version>
> - <packaging>jar</packaging>
> + <packaging>bundle</packaging>
> <name>SLF4J LOG4J-12 Binding</name>
>
> <url>http://www.slf4j.org</url>
> @@ -38,22 +38,25 @@
> </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>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Export-Package>
> + org.slf4j;version=1.3
> + </Export-Package>
> + <Private-Package>
> + org.slf4j.impl, org.slf4j.spi
> + </Private-Package>
> + <Import-Package>org.apache.log4j, !org.slf4j.*</Import-Package>
> + </instructions>
> + </configuration>
> + </plugin>
> </plugins>
> - </build>
> + </build>
>
>
> </project>
> \ No newline at end of file
>
> Modified: slf4j/trunk/slf4j-nop/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-nop/pom.xml (original)
> +++ slf4j/trunk/slf4j-nop/pom.xml Tue Feb 6 17:13:54 2007
> @@ -6,7 +6,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -14,7 +14,7 @@
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-nop</artifactId>
> <version>${parent.version}</version>
> - <packaging>jar</packaging>
> + <packaging>bundle</packaging>
> <name>SLF4J NOP Binding</name>
>
> <url>http://www.slf4j.org</url>
> @@ -34,38 +34,22 @@
> <plugins>
>
> <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> - <configuration>
> - <archive>
> - <manifestEntries>
> - <Bundle-Version>
> - 1.3.0.SNAPSHOT
> - </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>
> - <executions>
> - <execution>
> - <id>bundle-test-jar</id>
> - <phase>package</phase>
> - <goals>
> - <goal>jar</goal>
> - <goal>test-jar</goal>
> - </goals>
> - </execution>
> - </executions>
> - </plugin>
> -
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Export-Package>
> + org.slf4j;version=1.3
> + </Export-Package>
> + <Private-Package>
> + org.slf4j.impl, org.slf4j.spi
> + </Private-Package>
> + <Import-Package>!org.slf4j.*</Import-Package>
> + </instructions>
> + </configuration>
> + </plugin>
> +
> </plugins>
>
> </build>
>
> 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 Tue Feb 6 17:13:54 2007
> @@ -6,7 +6,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -14,7 +14,7 @@
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-osgi-test-bundle</artifactId>
> <version>${parent.version}</version>
> - <packaging>jar</packaging>
> + <packaging>bundle</packaging>
> <name>SLF4J Testing Bundle</name>
>
> <url>http://www.slf4j.org</url>
> @@ -56,25 +56,21 @@
> <build>
> <plugins>
> <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> <configuration>
> - <archive>
> - <manifestEntries>
> - <Bundle-Version>
> - 1.3.0.SNAPSHOT
> - </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>
> + <instructions>
> + <Export-Package>
> + org.slf4j.osgi.test.service
> + </Export-Package>
> + <Private-Package>org.slf4j.osgi.test</Private-Package>
> + <Import-Package>
> + org.osgi.framework,org.slf4j;version="[1.3,1.4)"
> + </Import-Package>
> + <Bundle-Activator>org.slf4j.osgi.test.Activator</Bundle-Activator>
> + <DynamicImport-Package>org.apache.commons.logging</DynamicImport-Package>
> + </instructions>
> </configuration>
> </plugin>
> </plugins>
>
> Modified: slf4j/trunk/slf4j-simple/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-simple/pom.xml (original)
> +++ slf4j/trunk/slf4j-simple/pom.xml Tue Feb 6 17:13:54 2007
> @@ -3,7 +3,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> @@ -11,7 +11,7 @@
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-simple</artifactId>
> <version>${parent.version}</version>
> - <packaging>jar</packaging>
> + <packaging>bundle</packaging>
> <name>SLF4J Simple Binding</name>
>
> <url>http://www.slf4j.org</url>
> @@ -30,21 +30,23 @@
>
> <build>
> <plugins>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-jar-plugin</artifactId>
> - <configuration>
> - <archive>
> - <manifestEntries>
> - <Bundle-Version>1.3.0.SNAPSHOT</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>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <Export-Package>
> + org.slf4j;version=1.3
> + </Export-Package>
> + <Private-Package>
> + org.slf4j.impl, org.slf4j.spi
> + </Private-Package>
> + <Import-Package>!org.slf4j.*</Import-Package>
> + </instructions>
> + </configuration>
> + </plugin>
> + </plugins>
> </build>
>
>
>
> Modified: slf4j/trunk/slf4j-site/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-site/pom.xml (original)
> +++ slf4j/trunk/slf4j-site/pom.xml Tue Feb 6 17:13:54 2007
> @@ -5,7 +5,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
>
> Modified: slf4j/trunk/slf4j-skin/pom.xml
> ==============================================================================
> --- slf4j/trunk/slf4j-skin/pom.xml (original)
> +++ slf4j/trunk/slf4j-skin/pom.xml Tue Feb 6 17:13:54 2007
> @@ -5,7 +5,7 @@
> <parent>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-parent</artifactId>
> - <version>1.3-SNAPSHOT</version>
> + <version>1.3.0-SNAPSHOT</version>
> </parent>
>
> <modelVersion>4.0.0</modelVersion>
> _______________________________________________
> dev mailing list
> dev at slf4j.org
> http://www.slf4j.org/mailman/listinfo/dev
>
>
>
More information about the slf4j-dev
mailing list