From 82b11b44aba6723ad4ab9e6b472e4477f3903a6e Mon Sep 17 00:00:00 2001
From: Jeremy Norris <jeremy.norris@lbnetworks.co>
Date: Tue, 2 Jan 2024 21:22:28 -0600
Subject: [PATCH] Switch to bnd-maven-plugin in order to support Multi-Release
 OSGi bundle JAR's via supplemental manifest files.

---
 pom.xml | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index c479b830..39bcb7c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,12 +47,14 @@
             <timezone>+9</timezone>
         </developer>
         <developer>
+            <id>mwiede</id>
             <name>Matthias Wiedemann</name>
             <email>mwiede@gmx.de</email>
             <organization>Community</organization>
             <organizationUrl>https://github.com/mwiede</organizationUrl>
         </developer>
         <developer>
+            <id>norrisjeremy</id>
             <name>Jeremy Norris</name>
             <organization>Community</organization>
             <organizationUrl>https://github.com/norrisjeremy</organizationUrl>
@@ -254,7 +256,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>16</version>
+                                    <version>17</version>
                                 </requireJavaVersion>
                                 <dependencyConvergence />
                                 <banDuplicatePomDependencyVersions />
@@ -403,28 +405,38 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.9</version>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+                <version>7.0.0</version>
                 <configuration>
-                    <instructions>
-                        <Export-Package>com.jcraft.jsch;-noimport:=true</Export-Package>
-                        <Import-Package><![CDATA[
-                            com.sun.jna*;version="${range;[=0,+)}",
-                            org.apache.logging.log4j*;version="${range;[=0,4)}",
-                            org.bouncycastle*;version="[1.76,${versionmask;+})",
-                            org.slf4j*;version="[1.7,${versionmask;+})",
-                            org.ietf.jgss;resolution:=optional,
+                    <bnd><![CDATA[
+                        -noextraheaders: false
+                        -removeheaders: \
+                            Bnd-LastModified,\
+                            Bundle-Developers,\
+                            Bundle-DocURL,\
+                            Bundle-SCM,\
+                            Created-By,\
+                            Private-Package
+                        Bundle-SymbolicName: ${project.groupId}.${project.artifactId}
+                        Export-Package: com.jcraft.jsch;-noimport:=true
+                        Import-Package: \
+                            com.sun.jna*;version="${range;[=0,+)}";resolution:=optional,\
+                            org.apache.logging.log4j*;version="${range;[=0,4)}";resolution:=optional,\
+                            org.bouncycastle*;version="[1.76,${versionmask;+})";resolution:=optional,\
+                            org.slf4j*;version="[1.7,${versionmask;+})";resolution:=optional,\
+                            org.newsclub.net.unix;resolution:=optional,\
+                            org.ietf.jgss;resolution:=optional,\
+                            !java.*,\
                             *
-                            ]]></Import-Package>
-                    </instructions>
+                        ]]></bnd>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>bundle-manifest</id>
+                        <id>bnd-process</id>
                         <phase>process-classes</phase>
                         <goals>
-                            <goal>manifest</goal>
+                            <goal>bnd-process</goal>
                         </goals>
                     </execution>
                 </executions>