natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
John E. Conlon 2007-02-06 16:13:54 +00:00
parent 14763462a8
commit 3696d72d3b
20 changed files with 138 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jcl104-over-slf4j/pom.xml
View File

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

9
jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,9 +0,0 @@
Implementation-Title: jcl104-over-slf4j
Bundle-ManifestVersion: 2
Bundle-SymbolicName: jcl104.over.slf4j
Bundle-Name: jcl104-over-slf4j
Bundle-Vendor: SLF4J.ORG
Export-Package: org.apache.commons.logging,
org.apache.commons.logging.impl
Import-Package: org.slf4j
Bundle-ClassPath: ., target/classes/

2
pom.xml
View File

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

14
slf4j-api/pom.xml
View File

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

8
slf4j-api/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,8 +0,0 @@
Implementation-Title: slf4j-api
Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.api
Bundle-Name: slf4j-api
Bundle-Vendor: SLF4J.ORG
Export-Package: org.slf4j;partial=true;mandatory:=partial,
org.slf4j.spi,
org.slf4j.impl;partial=true;mandatory:=partial

2
slf4j-archetype/pom.xml
View File

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

33
slf4j-jcl/pom.xml
View File

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

9
slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,9 +0,0 @@
Implementation-Title: slf4j-jcl
Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.jcl
Bundle-Name: slf4j-jcl
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api;visibility:=reexport
Export-Package: org.slf4j, org.slf4j.impl
Import-Package: org.apache.commons.logging
Bundle-ClassPath: ., target/classes/

47
slf4j-jdk14/pom.xml
View File

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

11
slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,11 +0,0 @@
Implementation-Title: slf4j-jdk14
Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.jdk14
Bundle-Name: slf4j-jdk14
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api;visibility:=reexport
Export-Package: org.slf4j, org.slf4j.impl
Import-Package: org.slf4j.spi, org.slf4j.impl
Bundle-ClassPath: ., target/classes/

37
slf4j-log4j12/pom.xml
View File

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

12
slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,12 +0,0 @@
Implementation-Title: slf4j-log4j12
Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.log4j12
Bundle-Name: slf4j-log4j12
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api;visibility:=reexport
Export-Package: org.slf4j, org.slf4j.impl
Import-Package: org.apache.log4j,
org.slf4j.spi,
org.slf4j.impl
Bundle-ClassPath: .,
target/classes/

52
slf4j-nop/pom.xml
View File

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

8
slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,8 +0,0 @@
Implementation-Title: slf4j-nop
Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.nop
Bundle-Name: slf4j-nop
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api;visibility:=reexport
Export-Package: org.slf4j, org.slf4j.impl
Import-Package: org.slf4j.spi

36
slf4j-osgi-test-bundle/pom.xml
View File

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

9
slf4j-osgi-test-bundle/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,9 +0,0 @@
Implementation-Title: slf4j-osgi.test.bundle
Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.osgi.test.bundle
Bundle-Name: slf4j-osgi-test-bundle
Bundle-Vendor: SLF4J.ORG
Import-Package: org.osgi.framework,org.slf4j;version="[1.3,1.4)"
DynamicImport-Package: org.apache.commons.logging;version="1.0.4"
Export-Package: org.slf4j.osgi.test.service
Bundle-Activator: org.slf4j.osgi.test.Activator

36
slf4j-simple/pom.xml
View File

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

8
slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,8 +0,0 @@
Implementation-Title: slf4j-simple
Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.simple
Bundle-Name: slf4j-simple
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api;visibility:=reexport
Export-Package: org.slf4j, org.slf4j.impl
Import-Package: org.slf4j.spi

2
slf4j-site/pom.xml
View File

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

2
slf4j-skin/pom.xml
View File

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