FELIX-660: temporarily commit BND patch
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@723253 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java b/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
index c348cec..c22696f 100644
--- a/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
+++ b/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
@@ -1580,7 +1580,7 @@
}
} else {
if (dot.getDirectories().containsKey(path)) {
- analyzeJar(dot, path, classSpace, contained, referred,
+ analyzeJar(dot, path + '/', classSpace, contained, referred,
uses);
} else {
warning("No sub JAR or directory " + path);
diff --git a/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java b/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java
index 8964432..73d14c3 100644
--- a/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java
+++ b/bundleplugin/src/main/java/aQute/lib/osgi/Verifier.java
@@ -159,8 +159,7 @@
try {
Jar sub = new Jar(jarOrDir);
- EmbeddedResource.build(sub, resource);
-
+ addClose(sub);
// TODO verify if directory exists and see how to
// get it in a JAR ...
list.add(sub);