From ae597a1a223559cd337c4d13ccfedef9a5ec971b Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann@iils.de>
Date: Wed, 10 Jan 2024 14:37:44 +0100
Subject: [PATCH] [Build|OSGi] Migrate from Maven-Bundle-Plugin to
 BND-Maven-Plugin

The former uses the latter under the hood, thus the latter is always
more recent and more powerful.
The Bnd-Maven-Plugin requires Java-17 to run the Maven build.
---
 .../matheclipse-external/pom.xml              | 10 +++---
 symja_android_library/pom.xml                 | 32 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/symja_android_library/matheclipse-external/pom.xml b/symja_android_library/matheclipse-external/pom.xml
index 88a20c7e1d..6ee65f033c 100644
--- a/symja_android_library/matheclipse-external/pom.xml
+++ b/symja_android_library/matheclipse-external/pom.xml
@@ -57,12 +57,12 @@
 		<plugins>
 
 			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
 				<configuration>
-					<instructions>
-						<Import-Package>!net.sf.saxon,*</Import-Package>
-					</instructions>
+					<bnd><![CDATA[
+						Import-Package: !net.sf.saxon,*
+					]]></bnd>
 				</configuration>
 			</plugin>
 
diff --git a/symja_android_library/pom.xml b/symja_android_library/pom.xml
index 0f030a916f..e308405972 100644
--- a/symja_android_library/pom.xml
+++ b/symja_android_library/pom.xml
@@ -399,9 +399,9 @@
 		<pluginManagement>
 			<plugins>
 				<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>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -444,8 +444,7 @@
 					<version>3.3.0</version>
 					<configuration>
 						<archive>
-							<manifestFile>
-								${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+							<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 						</archive>
 					</configuration>
 				</plugin>
@@ -582,22 +581,21 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-Name>${project.artifactId}</Bundle-Name>
-						<!-- Suppress import of own exported packages -->
-						<Export-Package>*;-noimport:=true</Export-Package>
-						<_nouses>true</_nouses>
-					</instructions>
-					<niceManifest>true</niceManifest>
-				</configuration>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
 				<executions>
 					<execution>
+						<id>generate-manifest</id>
 						<goals>
-							<goal>manifest</goal>
+							<goal>bnd-process</goal>
 						</goals>
+						<configuration><bnd><![CDATA[
+							Bundle-SymbolicName: org.$[replacestring;${artifactId};-;.]
+							Bundle-Name: ${project.artifactId}
+							# Suppress import of own exported packages
+							-exportcontents: *;-noimport:=true
+							-noextraheaders: true
+						]]></bnd></configuration>
 					</execution>
 				</executions>
 			</plugin>