From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 7 Mar 2024 14:27:50 +0000 (+0100)
Subject: Remove Require-Bundle only for JNA platform
X-Git-Tag: v2.3.10~5
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=e021d17c09f8586a68177e9eb40d9caa088c37b1

Remove Require-Bundle only for JNA platform
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index d274ced..2a9331d 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1213,24 +1213,23 @@ public class Repackage {
 					manifest.getMainAttributes().remove(key);
 					origin.deleted.add("MANIFEST header " + key);
 				}
-			if (key.equals(REQUIRE_BUNDLE.toString())) {
-				manifest.getMainAttributes().remove(key);
-				origin.deleted.add("MANIFEST header " + key);
-			}
 		}
 
 		// de-pollute MANIFEST
 		for (Iterator<Map.Entry<Object, Object>> manifestEntries = manifest.getMainAttributes().entrySet()
 				.iterator(); manifestEntries.hasNext();) {
 			Map.Entry<Object, Object> manifestEntry = manifestEntries.next();
-			switch (manifestEntry.getKey().toString()) {
+			String key = manifestEntry.getKey().toString();
+			// TODO make it more generic
+			if (key.equals(REQUIRE_BUNDLE.toString()) && nameVersion.getName().equals("com.sun.jna.platform"))
+				manifestEntries.remove();
+			switch (key) {
 			case "Archiver-Version":
 			case "Build-By":
 			case "Created-By":
 			case "Originally-Created-By":
 			case "Tool":
 			case "Bnd-LastModified":
-			case "Require-Bundle":
 				manifestEntries.remove();
 				origin.deleted.add("MANIFEST header " + manifestEntry.getKey());
 				break;