From 632410565b26e4d67fc7ef2ce4c212380b4e59d1 Mon Sep 17 00:00:00 2001
From: Stefan Bischof <stbischof@bipolis.org>
Date: Fri, 28 Oct 2022 13:21:26 +0200
Subject: [PATCH] enhance manifest with capabilities

provide for SLF4JServiceProvider (with name attribute
require for registrar

Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
---
 slf4j-api/src/main/resources/META-INF/MANIFEST.MF      | 7 ++++---
 slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF    | 8 ++++++--
 slf4j-nop/src/main/resources/META-INF/MANIFEST.MF      | 6 ++++++
 slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF | 6 ++++++
 slf4j-simple/src/main/resources/META-INF/MANIFEST.MF   | 6 ++++++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
index bcb51e34..eb0a2870 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 0c165d31..c7401272 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<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)))"
diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
index 31995c5d..e8026f44 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<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)))"
diff --git a/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF b/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF
index 980e84e6..fed77da5 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<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)))"
diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
index 6ffd4fda..9e8d817a 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<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)))"