X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=909e2f456ba80510ae9cc867bacd56597d4dc7d7;hb=c76ee2fffc591cbd3c0deb0aec9f2b1add5a1bca;hp=88b2f37a44fbd81854344baa11b05639c56bb6af;hpb=a6ebf62be67d594d8c05eb56036ba4816c43c6e5;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 88b2f37..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;
 			}
 
@@ -412,7 +412,8 @@ public class Repackage {
 				entries: while ((entry = jarIn.getNextJarEntry()) != null) {
 					if (entry.isDirectory())
 						continue entries;
-					if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF")) {
+					if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".DSA")
+							|| entry.getName().endsWith(".SF")) {
 						origin.deleted.add("cryptographic signatures from " + artifact);
 						continue entries;
 					}
@@ -1009,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