From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 7 Mar 2024 14:13:42 +0000 (+0100)
Subject: Force removal of Require-Bundle
X-Git-Tag: v2.3.10~7
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=599e11e1c9c6b8b46b461edb98d5e47ecdad74aa

Force removal of Require-Bundle
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 0daf3c4..2111b49 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1030,10 +1030,6 @@ public class Repackage {
 			sourceManifest = jarIn.getManifest();
 			if (sourceManifest == null)
 				logger.log(WARNING, file + " has no manifest");
-			else {
-				if (!doNotModify)
-					sourceManifest.getMainAttributes().remove(REQUIRE_BUNDLE.toString());
-			}
 			manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest();
 
 			String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString());
@@ -1217,6 +1213,10 @@ 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