projects
/
cc0
/
argeo-build.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Force removal of Require-Bundle
[cc0/argeo-build.git]
/
src
/
org
/
argeo
/
build
/
Repackage.java
diff --git
a/src/org/argeo/build/Repackage.java
b/src/org/argeo/build/Repackage.java
index 0daf3c401add6e94ed9c3a50c59528a1008900d0..2111b49c67ce638f72c0fe90ac772dda4338b1cd 100644
(file)
--- 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");
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());
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);
}
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
}
// de-pollute MANIFEST