Skip to content

Commit 6324105

Browse files
stbischofceki
authored andcommitted
enhance manifest with capabilities
provide for SLF4JServiceProvider (with name attribute require for registrar Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
1 parent e540299 commit 6324105

File tree

5 files changed

+28
-5
lines changed

5 files changed

+28
-5
lines changed

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Export-Package: org.slf4j;version=${parsedVersion.osgiVersion},
99
org.slf4j.helpers;version=${parsedVersion.osgiVersion},
1010
org.slf4j.event;version=${parsedVersion.osgiVersion}
1111
Import-Package: org.slf4j.spi;version=${parsedVersion.osgiVersion}
12-
Require-Capability: osgi.extender;filter:="(osgi.extender=osgi.service
13-
loader.processor)",osgi.serviceloader;filter:="(osgi.serviceloader=or
14-
g.slf4j.spi.SLF4JServiceProvider)"
12+
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
13+
celoader.processor)(version>=1.0.0)(!(version>=2.0.0)))",osgi.service
14+
loader;filter:="(osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvide
15+
r)";osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider"

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
99
org.slf4j.spi;version=${parsedVersion.osgiVersion},
1010
org.slf4j.helpers;version=${parsedVersion.osgiVersion},
1111
org.slf4j.event;version=${parsedVersion.osgiVersion}
12-
Require-Capability: osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"
13-
Provide-Capability: osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider
12+
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
13+
pi.SLF4JServiceProvider";type=jul;effective:=active,osgi.serviceloade
14+
r;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="
15+
org.slf4j.jul.JULServiceProvider";type=jul
16+
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
17+
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"

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

+6
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
99
org.slf4j.spi;version=${parsedVersion.osgiVersion},
1010
org.slf4j.helpers;version=${parsedVersion.osgiVersion},
1111
org.slf4j.event;version=${parsedVersion.osgiVersion}
12+
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
13+
pi.SLF4JServiceProvider";type=nop;effective:=active,osgi.serviceloade
14+
r;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="
15+
org.slf4j.nop.NOPServiceProvider";type=nop
16+
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
17+
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"

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

+6
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
1010
org.slf4j.helpers;version=${parsedVersion.osgiVersion},
1111
org.slf4j.event;version=${parsedVersion.osgiVersion},
1212
org.apache.log4j
13+
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
14+
pi.SLF4JServiceProvider";type=reload4j;effective:=active,osgi.service
15+
loader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";regist
16+
er:="org.slf4j.reload4j.Reload4jServiceProvider";type=reload4j
17+
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
18+
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"

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

+6
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
1010
org.slf4j.spi;version=${parsedVersion.osgiVersion},
1111
org.slf4j.helpers;version=${parsedVersion.osgiVersion},
1212
org.slf4j.event;version=${parsedVersion.osgiVersion}
13+
Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
14+
pi.SLF4JServiceProvider";type=simple;effective:=active,osgi.servicelo
15+
ader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register
16+
:="org.slf4j.simple.SimpleServiceProvider";type=simple
17+
Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
18+
celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"

0 commit comments

Comments
 (0)