Ensure proper version ranges of re-imported OSGi packages

HannesWell · ceki · commit d72cbb17b13a · 2023-04-09T11:16:21.000+02:00
Ensure that the imported packages, which are also exported by a logback
bundle have a suitable version range.

Signed-off-by: Hannes Wellmann &lt;wellmann.hannes1@gmx.net&gt;
diff --git a/logback-access/pom.xml b/logback-access/pom.xml
@@ -145,6 +145,7 @@
                 Bnd's analysis of java code.
             -->
             <Import-Package>
+              ch.qos.logback.access*;version="${range;[==,+);${maven_version;${project.version}}}",
               ch.qos.logback.core.rolling,
               ch.qos.logback.core.rolling.helper,
               org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
@@ -320,6 +320,7 @@
                  config files). They won't be found by Bnd's analysis
                  of java code. -->
             <Import-Package>
+              ch.qos.logback.classic*;version="${range;[==,+);${maven_version;${project.version}}}",
               sun.reflect;resolution:=optional,
               javax.*;resolution:=optional,
               org.xml.*;resolution:=optional,
diff --git a/logback-core/pom.xml b/logback-core/pom.xml
@@ -140,8 +140,9 @@
         </executions>
         <configuration>
           <instructions>
-            <Export-Package>ch.qos.logback.core.*</Export-Package>
+            <Export-Package>ch.qos.logback.core*</Export-Package>
             <Import-Package>
+              ch.qos.logback.core*;version="${range;[==,+);${maven_version;${project.version}}}",
               javax.*;resolution:=optional,
               org.xml.*;resolution:=optional,
               org.fusesource.jansi;resolution:=optional,
