From 40fd191e3164ddf475cbcceec87c5896c1efbb40 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Wed, 21 Dec 2022 00:07:48 +0100
Subject: [PATCH] SLFJ4-576: Export client packages of slf4j-api in version 1

Fixes https://jira.qos.ch/browse/SLF4J-576

This allows to use the slf4j-api version 2 artifact as drop-in
replacement for slf4j-api version 1 in OSGi environments as well.
slf4j-api can now be wired to bundles that require packages of slf4j-api
in version 1 or 2.

Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
---
 pom.xml           | 3 +--
 slf4j-api/pom.xml | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b1bcdc6a..90687c388 100755
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,7 @@
   <properties>
     <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
     <project.build.outputTimestamp>2022-12-12T19:19:39Z</project.build.outputTimestamp>    
-    <latest.stable.version>1.7.36</latest.stable.version>
-    <latest.2.version>2.0.0-alpha7</latest.2.version>    
+    <latest.1.version>1.7.36</latest.1.version>  
     <!-- java.util.ServiceLoader requires Java 6 -->
     <jdk.version>8</jdk.version>
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 37a8dee97..bf0df74d4 100755
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -59,6 +59,13 @@
         <configuration>
           <instructions>
             <Import-Package>org.slf4j.spi;version="${range;[===,+);${version;===;${maven_version;${project.version}}}}"</Import-Package>
+            <!-- Export client packages of slf4j-api version 1 to make slf4j-api 2 usable for bundles that only import slf4j-2 -->
+            <_exportcontents><![CDATA[
+              *,\
+              org.slf4j;version="${latest.1.version}";uses:="org.slf4j.event,org.slf4j.helpers,org.slf4j.spi",\
+              org.slf4j.event;version="${latest.1.version}";uses:="org.slf4j,org.slf4j.helpers",\
+              org.slf4j.helpers;version="${latest.1.version}";uses:="org.slf4j,org.slf4j.event,org.slf4j.spi"
+            ]]></_exportcontents>
             <Require-Capability><![CDATA[
               osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))",
               osgi.serviceloader;filter:="(osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider)";osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider"