Patch for bnd

osgi.patch

diff --git a/subprojects/osgi/osgi.gradle b/subprojects/osgi/osgi.gradle
index 57d7c1f..ccef5a0 100644
--- a/subprojects/osgi/osgi.gradle
+++ b/subprojects/osgi/osgi.gradle
@@ -21,7 +21,8 @@ dependencies {
     compile project(':plugins')
     compile libraries.slf4j_api
 
-    compile module('biz.aQute:bndlib:1.50.0')
+//    compile module('biz.aQute:bndlib:1.50.0')
+    compile files('/home/cchampeau/Téléchargements/biz.aQute.bndlib.jar')
 }
 
 useTestFixtures()
diff --git a/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java b/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java
index 55746c9..5c97e67 100644
--- a/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java
+++ b/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java
@@ -16,7 +16,7 @@
 
 package org.gradle.api.internal.plugins.osgi;
 
-import aQute.lib.osgi.Analyzer;
+import aQute.bnd.osgi.Analyzer;
 
 public class ContainedVersionAnalyzer extends Analyzer {
-}
\ No newline at end of file
+}
diff --git a/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java b/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java
index 2aa4750..832ac12 100644
--- a/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java
+++ b/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java
@@ -15,7 +15,7 @@
  */
 package org.gradle.api.internal.plugins.osgi;
 
-import aQute.lib.osgi.Analyzer;
+import aQute.bnd.osgi.Analyzer;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.java.archives.Attributes;
@@ -107,7 +107,7 @@ public class DefaultOsgiManifest extends DefaultManifest implements OsgiManifest
 
         analyzer.setJar(getClassesDir());
 
-        analyzer.setClasspath(getClasspath().getFiles().toArray(new File[getClasspath().getFiles().size()]));
+        if (getClasspath()!=null) analyzer.setClasspath(getClasspath().getFiles().toArray(new File[getClasspath().getFiles().size()]));
     }
 
     private String instructionValueString(String instructionName) {