From 258f689a32e1e1f00e81847fe2b4e5525949a275 Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Sun, 19 Jan 2025 01:06:41 +0100
Subject: [PATCH 1/5] add osgi metadata

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

diff --git a/pom.xml b/pom.xml
index 74f614a..def9e14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,46 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>6.0.0</version>
+                    <configuration>
+                        <supportedProjectTypes>
+                            <supportedProjectType>jar</supportedProjectType>
+                            <supportedProjectType>bundle</supportedProjectType>
+                        </supportedProjectTypes>
+                        <instructions>
+                            <Import-Package>
+                               !java
+                            </Import-Package>
+                            <Export-Package>
+                                {local-packages}
+                            </Export-Package>
+                        </instructions>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>manifest</id>
+                            <goals>
+                                <goal>manifest</goal>
+                            </goals>
+                            <configuration>
+                                <supportIncrementalBuild>true</supportIncrementalBuild>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>bundle</id>
+                            <goals>
+                                <goal>bundle</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -105,6 +145,10 @@
                     <goals>deploy</goals>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 

From 352a6a219983e149597896f1f12bbe22bcbf9410 Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Sun, 19 Jan 2025 10:27:14 +0100
Subject: [PATCH 2/5] downgrade maven-bundle-plugin to 5.1.9 as 6 requires java
 17

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index def9e14..c19b731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>6.0.0</version>
+                    <version>5.1.9</version>
                     <configuration>
                         <supportedProjectTypes>
                             <supportedProjectType>jar</supportedProjectType>

From cf781b2cb3c6a739fae1aae2c202104345c53f71 Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Wed, 22 Jan 2025 12:12:25 +0100
Subject: [PATCH 3/5] fix formatting

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c19b731..25c0f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,8 @@
     <build>
         <pluginManagement>
             <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <version>5.1.9</version>
                     <configuration>

From aecb9ac644a10887d4a70914663a64696c6545ba Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Thu, 27 Mar 2025 19:41:13 +1100
Subject: [PATCH 4/5] Update pom.xml

Use instructions from https://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html#_adding_osgi_metadata_to_existing_projects_without_changing_the_packaging_type
---
 pom.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 25c0f58..a19da0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,14 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
@@ -47,7 +55,7 @@
                         </supportedProjectTypes>
                         <instructions>
                             <Import-Package>
-                               !java
+                                !java
                             </Import-Package>
                             <Export-Package>
                                 {local-packages}
@@ -56,19 +64,11 @@
                     </configuration>
                     <executions>
                         <execution>
-                            <id>manifest</id>
+                            <id>bundle-manifest</id>
+                            <phase>process-classes</phase>
                             <goals>
                                 <goal>manifest</goal>
                             </goals>
-                            <configuration>
-                                <supportIncrementalBuild>true</supportIncrementalBuild>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>bundle</id>
-                            <goals>
-                                <goal>bundle</goal>
-                            </goals>
                         </execution>
                     </executions>
                 </plugin>

From 44e78281f1a5334c178b399922cb74bef5d53e60 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Thu, 27 Mar 2025 19:43:11 +1100
Subject: [PATCH 5/5] Update pom.xml

Remove unnecessary supportedProjectTypes
---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a19da0e..6c569a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,6 @@
                     <artifactId>maven-bundle-plugin</artifactId>
                     <version>5.1.9</version>
                     <configuration>
-                        <supportedProjectTypes>
-                            <supportedProjectType>jar</supportedProjectType>
-                            <supportedProjectType>bundle</supportedProjectType>
-                        </supportedProjectTypes>
                         <instructions>
                             <Import-Package>
                                 !java