diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index a03c1221..f4983d59 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -42,6 +42,16 @@ 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 diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000..07bb1c80 --- /dev/null +++ b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Implementation-Title: slf4j-api +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: slf4j.api +Bundle-Name: slf4j-api +Bundle-Vendor: SLF4J.ORG +Export-Package: org.slf4j + org.slf4j.spi, + org.slf4j.helpers \ No newline at end of file diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 895ab65e..c3d26891 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -43,23 +43,19 @@ - - org.apache.felix - maven-bundle-plugin - 0.9.0-incubator-SNAPSHOT - true - - - - org.slf4j;version=1.3, org.slf4j.spi;version=1.3 - - - org.slf4j.impl, org.slf4j.helpers - - !org.slf4j.* - - - + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000..abee3a65 --- /dev/null +++ b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,9 @@ +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.helpers +Bundle-ClassPath: ., target/classes/ \ No newline at end of file diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 46be31b3..e874a72d 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.3.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -39,25 +39,20 @@ - - org.apache.felix - maven-bundle-plugin - 0.9.0-incubator-SNAPSHOT - true - - - - org.slf4j;version=1.3, org.slf4j.spi;version=1.3 - - - org.slf4j.impl, org.slf4j.helpers - - org.apache.log4j, !org.slf4j.* - - - + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + - \ No newline at end of file diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 47477447..020823c3 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -29,30 +29,25 @@ ${project.version} - - - - - - org.apache.felix - maven-bundle-plugin - 0.9.0-incubator-SNAPSHOT - true - - - - org.slf4j;version=1.3, org.slf4j.spi;version=1.3 - - - org.slf4j.impl, org.slf4j.helpers - - !org.slf4j.* - - - - - - - - + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + + + + + \ No newline at end of file diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF index 1fd86626..e878b6ce 100644 --- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ -Implementation-Title: slf4j-simple +Implementation-Title: slf4j-nop Bundle-ManifestVersion: 2 -Bundle-SymbolicName: slf4j.simple -Bundle-Name: slf4j-simple +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 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index f17a6112..021236c0 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -28,25 +28,22 @@ - - - - org.apache.felix - maven-bundle-plugin - 0.9.0-incubator-SNAPSHOT - true - - - - org.slf4j;version=1.3, org.slf4j.spi;version=1.3 - - - org.slf4j.impl, org.slf4j.helpers - - !org.slf4j.* - - - + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${project.version} + ${project.version} + + src/main/resources/META-INF/MANIFEST.MF + + + +