This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 035b6fde8 Adapt OSGi metadata of sshd.osgi to work with slf4j-api 1
and 2
035b6fde8 is described below
commit 035b6fde88c499c78fd08c19d60a3b0ec29a3b57
Author: Hannes Wellmann <[email protected]>
AuthorDate: Sat Mar 18 01:00:10 2023 +0100
Adapt OSGi metadata of sshd.osgi to work with slf4j-api 1 and 2
SSHD-Mina is compatible with slf4j 1.7.x and 2.0.x. Adjust the OSGi
Import-Package entries in the MANIFEST.MF to make it work with both
versions of the slf4j.api bundle.
---
pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 89cce836e..27056106b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
<groovy.version>3.0.11</groovy.version>
<bouncycastle.version>1.70</bouncycastle.version>
<slf4j.version>1.7.32</slf4j.version>
+ <slf4j.upper.bound>3</slf4j.upper.bound>
<logback.version>1.2.11</logback.version>
<spring.version>5.3.20</spring.version>
<!-- NOTE: upgrading to 6.x requires Java 11 -->
@@ -1464,7 +1465,11 @@
</goals>
<configuration>
<instructions>
-
<Import-Package>org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))",*</Import-Package>
+ <Import-Package><![CDATA[
+
org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))",
+
org.slf4j*;version="${range;[==,${slf4j.upper.bound})}",
+ *
+ ]]></Import-Package>
<Export-Package>*;-noimport:=true</Export-Package>
</instructions>
<noWarningProjectTypes>pom</noWarningProjectTypes>
