[LOGBACK-1736] Make OSGi S.L.M. requirement for Configurator optional

HannesWell · ceki · commit 5c4fd5032e94 · 2023-04-25T18:33:48.000+02:00
For LOGBACK-1729 (https://jira.qos.ch/browse/LOGBACK-1729) the OSGi Service Loader Mediator Manifest entries were enhanced to be able to load logback Configurator services provided by other OSGi bundles. Unintentionally this requirement was only specified with 'cardinality:=multiple' and without 'resolution:=optional', which means that at least one bundle providing a Configurator service is required (but more are possible). This adds the forgotten 'resolution:=optional' directive to also allow the logback-classic bundle to resolve if no Configurator service is available, which is a valid case and for what the code is prepared. Fixes https://jira.qos.ch/browse/LOGBACK-1736 Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
@@ -331,9 +331,9 @@
             </Import-Package>
             <!-- Needed to integrate ServiceLoader mechanism with OSGi -->
             <Require-Capability><![CDATA[
-              osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))",
+              osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
               osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))",
-              osgi.serviceloader;filter:="(osgi.serviceloader=ch.qos.logback.classic.spi.Configurator)";osgi.serviceloader="ch.qos.logback.classic.spi.Configurator";cardinality:=multiple
+              osgi.serviceloader;filter:="(osgi.serviceloader=ch.qos.logback.classic.spi.Configurator)";osgi.serviceloader="ch.qos.logback.classic.spi.Configurator";resolution:=optional;cardinality:=multiple
             ]]></Require-Capability>
             <Provide-Capability><![CDATA[
               osgi.service;objectClass:List<String>="jakarta.servlet.ServletContainerInitializer";effective:=active,
