X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;fp=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=2a9331d559e611c943c53f2192a52741ecb4a270;hb=e021d17c09f8586a68177e9eb40d9caa088c37b1;hp=d274cedb7168b2fdf8c2f9d6234e67de558c1519;hpb=107cb07b8cb343efe3c9ebb3428eb4c88c143e17;p=cc0%2Fargeo-build.git 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> manifestEntries = manifest.getMainAttributes().entrySet() .iterator(); manifestEntries.hasNext();) { Map.Entry 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;