FELIX-899: update to latest editions of Bnd and Bindex
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@738785 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java b/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
index 41e387b..393e7ee 100644
--- a/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
+++ b/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
@@ -266,7 +266,7 @@
// Private-Package
Map<String, Map<String, String>> filtered = merge(
CONDITIONAL_PACKAGE, conditionals, imports,
- new HashSet<String>(), null);
+ new HashSet<String>());
// Imports can also specify a private import. These
// packages must also be copied to the bundle
@@ -647,10 +647,13 @@
*/
private void doIncludeResources(Jar jar) throws Exception {
String includes = getProperty("Bundle-Includes");
- if (includes == null)
- includes = getProperty("Include-Resource");
+ if (includes == null) {
+ includes = getProperty(INCLUDERESOURCE);
+ if ( includes == null )
+ includes = getProperty("Include-Resource");
+ }
else
- warning("Please use Include-Resource instead of Bundle-Includes");
+ warning("Please use -includeresource instead of Bundle-Includes");
if (includes == null)
return;