From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 19 Mar 2023 08:54:52 +0000 (+0100)
Subject: Fix header cleaning
X-Git-Tag: v2.3.5~46
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=c76ee2fffc591cbd3c0deb0aec9f2b1add5a1bca;p=cc0%2Fargeo-build.git

Fix header cleaning
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index c22a8f5..909e2f4 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -260,7 +260,7 @@ public class Repackage {
 				try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(unmodifiedTarget))) {
 					manifest = jarIn.getManifest();
 				}
-				createSourceJar(unmodifiedTarget, manifest);
+				createSourceJar(bundleDir, manifest);
 				return;
 			}
 
@@ -1010,24 +1010,26 @@ public class Repackage {
 							file.getFileName() + ": " + key + " was " + previousValue + ", overridden with " + value);
 			}
 
-			// de-pollute MANIFEST
-			switch (key) {
+			// !! hack to remove unresolvable
+			if (key.equals("Provide-Capability") || key.equals("Require-Capability"))
+				if (nameVersion.getName().equals("osgi.core") || nameVersion.getName().equals("osgi.cmpn")) {
+					manifest.getMainAttributes().remove(key);
+				}
+		}
+
+		// de-pollute MANIFEST
+		for (Object header : manifest.getMainAttributes().keySet()) {
+			switch (header.toString()) {
 			case "Archiver-Version":
 			case "Build-By":
 			case "Created-By":
 			case "Originally-Created-By":
 			case "Tool":
 			case "Bnd-LastModified":
-				manifest.getMainAttributes().remove(key);
+				manifest.getMainAttributes().remove(header);
 				break;
 			default: // do nothing
 			}
-
-			// !! hack to remove unresolvable
-			if (key.equals("Provide-Capability") || key.equals("Require-Capability"))
-				if (nameVersion.getName().equals("osgi.core") || nameVersion.getName().equals("osgi.cmpn")) {
-					manifest.getMainAttributes().remove(key);
-				}
 		}
 
 		// license checks