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

Replace all remaining OSGi MANIFEST.MF by bundle-plugin instructions 

This ensures that there is only a single source for OSGi metadata.
Additionally this improves the metadata for some Export-Package entries.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
This commit is contained in:
Hannes Wellmann 2023-03-18 15:03:16 +01:00 committed by Ceki Gülcü
parent df44ace9c3
commit 2ec7c1034c
13 changed files with 71 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jul-to-slf4j/pom.xml
View File

@ -31,4 +31,20 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Automatic-Module-Name>jul.to.slf4j</Automatic-Module-Name>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,2 +0,0 @@
Bundle-ManifestVersion: 2
Automatic-Module-Name: jul.to.slf4j

16
log4j-over-slf4j/pom.xml
View File

@ -41,4 +41,20 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<_exportcontents>org.apache.log4j*;version=${reload4j.version};-noimport:=true</_exportcontents>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>

5
log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,5 +0,0 @@
Bundle-ManifestVersion: 2
Export-Package: org.apache.log4j;version=${reload4j.version},
org.apache.log4j.helpers;version=${reload4j.version},
org.apache.log4j.spi;version=${reload4j.version},
org.apache.log4j.xml;version=${reload4j.version}

29
pom.xml
View File

@ -474,6 +474,35 @@
</build>
</profile>
<profile>
<id>generate-osgi-service-loader-mediator-entries</id>
<activation>
<file>
<exists>src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider</exists>
</file>
</activation>
<build>
<!-- Add the OSGi Service Loader Mediator Specification Manifest entries for each module that has a SLF4JServiceProvider Service-Loader file.-->
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Provide-Capability><![CDATA[
osgi.service;objectClass:List<String>="org.slf4j.spi.SLF4JServiceProvider";type=${slf4j.provider.type};effective:=active,
osgi.serviceloader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="${slf4j.provider.implementation}";type=${slf4j.provider.type}
]]></Provide-Capability>
<Require-Capability><![CDATA[
osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"
]]></Require-Capability>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!--
<profile>
<id>travis</id>

2
slf4j-jdk14/pom.xml
View File

@ -18,6 +18,8 @@
<properties>
<module-name>org.slf4j.jul</module-name>
<slf4j.provider.implementation>org.slf4j.jul.JULServiceProvider</slf4j.provider.implementation>
<slf4j.provider.type>jul</slf4j.provider.type>
</properties>
<dependencies>

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

@ -1,7 +0,0 @@
Bundle-ManifestVersion: 2
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
pi.SLF4JServiceProvider";type=jul;effective:=active,osgi.serviceloade
r;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="
org.slf4j.jul.JULServiceProvider";type=jul
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"

2
slf4j-nop/pom.xml
View File

@ -19,6 +19,8 @@
<properties>
<module-name>org.slf4j.nop</module-name>
<slf4j.provider.implementation>org.slf4j.nop.NOPServiceProvider</slf4j.provider.implementation>
<slf4j.provider.type>nop</slf4j.provider.type>
</properties>
<dependencies>

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

@ -1,7 +0,0 @@
Bundle-ManifestVersion: 2
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
pi.SLF4JServiceProvider";type=nop;effective:=active,osgi.serviceloade
r;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="
org.slf4j.nop.NOPServiceProvider";type=nop
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"

4
slf4j-reload4j/pom.xml
View File

@ -18,6 +18,10 @@
<description>SLF4J Reload4j Provider</description>
<url>http://reload4j.qos.ch</url>
<properties>
<slf4j.provider.implementation>org.slf4j.reload4j.Reload4jServiceProvider</slf4j.provider.implementation>
<slf4j.provider.type>reload4j</slf4j.provider.type>
</properties>
<dependencies>
<dependency>

7
slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -1,7 +0,0 @@
Bundle-ManifestVersion: 2
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
pi.SLF4JServiceProvider";type=reload4j;effective:=active,osgi.service
loader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";regist
er:="org.slf4j.reload4j.Reload4jServiceProvider";type=reload4j
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"

2
slf4j-simple/pom.xml
View File

@ -18,6 +18,8 @@
<properties>
<module-name>org.slf4j.simple</module-name>
<slf4j.provider.implementation>org.slf4j.simple.SimpleServiceProvider</slf4j.provider.implementation>
<slf4j.provider.type>simple</slf4j.provider.type>
</properties>
<dependencies>

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

@ -1,7 +0,0 @@
Bundle-ManifestVersion: 2
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
pi.SLF4JServiceProvider";type=simple;effective:=active,osgi.servicelo
ader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register
:="org.slf4j.simple.SimpleServiceProvider";type=simple
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"