From 3696d72d3b5ff20be6ec562aae0bffc7e4383e68 Mon Sep 17 00:00:00 2001 From: "John E. Conlon" Date: Tue, 6 Feb 2007 16:13:54 +0000 Subject: [PATCH] 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. --- jcl104-over-slf4j/pom.xml | 31 +++++------ .../src/main/resources/META-INF/MANIFEST.MF | 9 ---- pom.xml | 2 +- slf4j-api/pom.xml | 14 +---- .../src/main/resources/META-INF/MANIFEST.MF | 8 --- slf4j-archetype/pom.xml | 2 +- slf4j-jcl/pom.xml | 33 ++++++------ .../src/main/resources/META-INF/MANIFEST.MF | 9 ---- slf4j-jdk14/pom.xml | 47 +++++++++-------- .../src/main/resources/META-INF/MANIFEST.MF | 11 ---- slf4j-log4j12/pom.xml | 37 +++++++------ .../src/main/resources/META-INF/MANIFEST.MF | 12 ----- slf4j-nop/pom.xml | 52 +++++++------------ .../src/main/resources/META-INF/MANIFEST.MF | 8 --- slf4j-osgi-test-bundle/pom.xml | 36 ++++++------- .../src/main/resources/META-INF/MANIFEST.MF | 9 ---- slf4j-simple/pom.xml | 36 +++++++------ .../src/main/resources/META-INF/MANIFEST.MF | 8 --- slf4j-site/pom.xml | 2 +- slf4j-skin/pom.xml | 2 +- 20 files changed, 138 insertions(+), 230 deletions(-) delete mode 100644 jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 slf4j-api/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 slf4j-nop/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 slf4j-osgi-test-bundle/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 slf4j-simple/src/main/resources/META-INF/MANIFEST.MF diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index 0a52d4e4..cc41cbf7 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -11,7 +11,7 @@ org.slf4j jcl104-over-slf4j ${parent.version} - jar + bundle JCL Implemented Over SLF4J http://www.slf4j.org @@ -30,19 +30,20 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - - ${project.version} - ${project.version} - - src/main/resources/META-INF/MANIFEST.MF - - - + + org.apache.felix + maven-bundle-plugin + true + + + + org.apache.commons.logging;version=1.0.4 + + org.apache.commons.logging.impl + org.slf4j;version="[1.3,1.4)" + + + diff --git a/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index dfa1cfb7..00000000 --- a/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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/ diff --git a/pom.xml b/pom.xml index 3702e894..90540944 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT pom SLF4J diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 585af2d7..ac14524b 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -44,17 +44,7 @@ org.apache.maven.plugins - maven-jar-plugin - - - - 1.3.0.SNAPSHOT - ${project.description} - ${project.version} - - src/main/resources/META-INF/MANIFEST.MF - - + maven-jar-plugin bundle-test-jar diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index e891238f..00000000 --- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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 \ No newline at end of file diff --git a/slf4j-archetype/pom.xml b/slf4j-archetype/pom.xml index 35e535e2..7635b428 100644 --- a/slf4j-archetype/pom.xml +++ b/slf4j-archetype/pom.xml @@ -2,7 +2,7 @@ slf4j-parent org.slf4j - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index 1d555f67..d016524c 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -11,7 +11,7 @@ org.slf4j slf4j-jcl ${parent.version} - jar + bundle SLF4J JCL Binding http://www.slf4j.org @@ -37,19 +37,22 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - - ${project.version} - ${project.version} - - src/main/resources/META-INF/MANIFEST.MF - - - + + org.apache.felix + maven-bundle-plugin + true + + + + org.slf4j;version=1.3 + + + org.slf4j.impl, org.slf4j.spi + + !org.slf4j.*,!org.apache.avalon.framework.logger,* + + + diff --git a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index b3349d24..00000000 --- a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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/ \ No newline at end of file diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index c5ee1cee..cf4c74e6 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -15,7 +15,7 @@ slf4j-jdk14 ${parent.version} - jar + bundle SLF4J JDK14 Binding http://www.slf4j.org @@ -32,31 +32,34 @@ - + - - org.apache.maven.plugins + + org.apache.maven.plugins maven-compiler-plugin - 1.4 - 1.4 + 1.4 + 1.4 - - org.apache.maven.plugins - maven-jar-plugin - - - - ${project.version} - ${project.version} - - src/main/resources/META-INF/MANIFEST.MF - - - - - + + org.apache.felix + maven-bundle-plugin + true + + + + org.slf4j;version=1.3 + + + org.slf4j.impl, org.slf4j.spi + + !org.slf4j.* + + + + + \ No newline at end of file diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 7ffe1fc2..00000000 --- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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/ - - diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 953252c2..2da19ef5 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ org.slf4j slf4j-log4j12 ${parent.version} - jar + bundle SLF4J LOG4J-12 Binding http://www.slf4j.org @@ -38,22 +38,25 @@ - - - org.apache.maven.plugins - maven-jar-plugin - - - - ${project.version} - ${project.version} - - src/main/resources/META-INF/MANIFEST.MF - - - + + + org.apache.felix + maven-bundle-plugin + true + + + + org.slf4j;version=1.3 + + + org.slf4j.impl, org.slf4j.spi + + org.apache.log4j, !org.slf4j.* + + + - + \ No newline at end of file diff --git a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 40555df4..00000000 --- a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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/ \ No newline at end of file diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 070c3832..207eb17d 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ org.slf4j slf4j-nop ${parent.version} - jar + bundle SLF4J NOP Binding http://www.slf4j.org @@ -34,38 +34,22 @@ - org.apache.maven.plugins - maven-jar-plugin - - - - - 1.3.0.SNAPSHOT - - - ${project.description} - - - ${project.version} - - - - src/main/resources/META-INF/MANIFEST.MF - - - - - - bundle-test-jar - package - - jar - test-jar - - - - - + org.apache.felix + maven-bundle-plugin + true + + + + org.slf4j;version=1.3 + + + org.slf4j.impl, org.slf4j.spi + + !org.slf4j.* + + + + diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 08d3ecb3..00000000 --- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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 \ No newline at end of file diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 1cc256e6..c0a2e827 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ org.slf4j slf4j-osgi-test-bundle ${parent.version} - jar + bundle SLF4J Testing Bundle http://www.slf4j.org @@ -56,25 +56,21 @@ - org.apache.maven.plugins - maven-jar-plugin + org.apache.felix + maven-bundle-plugin + true - - - - 1.3.0.SNAPSHOT - - - ${project.description} - - - ${project.version} - - - - src/main/resources/META-INF/MANIFEST.MF - - + + + org.slf4j.osgi.test.service + + org.slf4j.osgi.test + + org.osgi.framework,org.slf4j;version="[1.3,1.4)" + + org.slf4j.osgi.test.Activator + org.apache.commons.logging + diff --git a/slf4j-osgi-test-bundle/src/main/resources/META-INF/MANIFEST.MF b/slf4j-osgi-test-bundle/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index aa845436..00000000 --- a/slf4j-osgi-test-bundle/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 38ae139d..55c1d7df 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -11,7 +11,7 @@ org.slf4j slf4j-simple ${parent.version} - jar + bundle SLF4J Simple Binding http://www.slf4j.org @@ -30,21 +30,23 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - - 1.3.0.SNAPSHOT - ${project.description} - ${project.version} - - src/main/resources/META-INF/MANIFEST.MF - - - - + + org.apache.felix + maven-bundle-plugin + true + + + + org.slf4j;version=1.3 + + + org.slf4j.impl, org.slf4j.spi + + !org.slf4j.* + + + + diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index a8f1f085..00000000 --- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -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 \ No newline at end of file diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index a6df977e..7dcf28a9 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 diff --git a/slf4j-skin/pom.xml b/slf4j-skin/pom.xml index 42f35d05..3eb490ee 100644 --- a/slf4j-skin/pom.xml +++ b/slf4j-skin/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0