From ec508c48b2e33662be69349ac9b784ab7d292df1 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 24 Apr 2023 22:58:07 +0200 Subject: [PATCH] [LOGBACK-1736] Make OSGi S.L.M. requirement for Configurator optional 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 --- logback-classic/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index bbc933d650..1baa734fc4 100755 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -335,9 +335,9 @@ =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 ]]> ="jakarta.servlet.ServletContainerInitializer";effective:=active,