diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF index bcb51e341..eb0a28705 100755 --- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Export-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.slf4j.event;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j.spi;version=${parsedVersion.osgiVersion} -Require-Capability: osgi.extender;filter:="(osgi.extender=osgi.service - loader.processor)",osgi.serviceloader;filter:="(osgi.serviceloader=or - g.slf4j.spi.SLF4JServiceProvider)" +Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi + celoader.processor)(version>=1.0.0)(!(version>=2.0.0)))",osgi.service + loader;filter:="(osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvide + r)";osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider" diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF index 0c165d315..c7401272f 100755 --- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF @@ -9,5 +9,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.slf4j.event;version=${parsedVersion.osgiVersion} -Require-Capability: osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)" -Provide-Capability: osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider +Provide-Capability: osgi.service;objectClass:List="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)))" diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF index 31995c5db..e8026f444 100755 --- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF @@ -9,3 +9,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.slf4j.event;version=${parsedVersion.osgiVersion} +Provide-Capability: osgi.service;objectClass:List="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)))" diff --git a/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF b/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF index 980e84e66..fed77da50 100644 --- a/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF @@ -10,3 +10,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.slf4j.event;version=${parsedVersion.osgiVersion}, org.apache.log4j +Provide-Capability: osgi.service;objectClass:List="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)))" diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF index 6ffd4fdaf..9e8d817a9 100755 --- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF @@ -10,3 +10,9 @@ Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.slf4j.event;version=${parsedVersion.osgiVersion} +Provide-Capability: osgi.service;objectClass:List="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)))"