[gradle] 01/03: Add use-bndlib-1.50.0.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository gradle.

commit 1e6974b63bc13b8e9ebe40ed2753af4d210c9354
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Jul 14 13:59:55 2015 +0200

    Add use-bndlib-1.50.0.patch
    
    and switch to bnd 1.50.0, so that Gradle can be uploaded to unstable.
---
 debian/patches/series                  |  1 +
 debian/patches/use-bndlib-1.50.0.patch | 70 ++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index dbbc5c8..4b81d02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ disable_java9.diff
 maven_testng.diff
 eclipse-aether.diff
 maven-aether-provider.diff
+use-bndlib-1.50.0.patch
diff --git a/debian/patches/use-bndlib-1.50.0.patch b/debian/patches/use-bndlib-1.50.0.patch
new file mode 100644
index 0000000..328a25b
--- /dev/null
+++ b/debian/patches/use-bndlib-1.50.0.patch
@@ -0,0 +1,70 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 14 Jul 2015 13:57:27 +0200
+Subject: use bndlib 1.50.0
+
+Use bnd 1.50.0 from Debian Sid for the time being. Switch back as soon as the
+bnd2 transition is complete. Thanks to Fedora.
+http://pkgs.fedoraproject.org/cgit/gradle.git/plain/0003-Use-bndlib-1.50.0.patch
+
+Forwarded: not needed
+---
+ subprojects/osgi/osgi.gradle                                          | 2 +-
+ .../gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java    | 4 ++--
+ .../org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java     | 2 +-
+ .../gradle/api/internal/plugins/osgi/DefaultOsgiManifestTest.groovy   | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/subprojects/osgi/osgi.gradle b/subprojects/osgi/osgi.gradle
+index 843ef6b..3d0c034 100644
+--- a/subprojects/osgi/osgi.gradle
++++ b/subprojects/osgi/osgi.gradle
+@@ -21,7 +21,7 @@ dependencies {
+     compile project(':plugins')
+     compile libraries.slf4j_api
+ 
+-    compile module('biz.aQute.bnd:bndlib')
++    compile module('biz.aQute:bndlib')
+ }
+ 
+ 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 18e4ce6..6806aad 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.bnd.osgi.Analyzer;
++import aQute.lib.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 973ca24..d7fa4c2 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.bnd.osgi.Analyzer;
++import aQute.lib.osgi.Analyzer;
+ import org.gradle.api.file.FileCollection;
+ import org.gradle.api.internal.file.FileResolver;
+ import org.gradle.api.java.archives.Attributes;
+diff --git a/subprojects/osgi/src/test/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifestTest.groovy b/subprojects/osgi/src/test/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifestTest.groovy
+index 3e3024d..7ea9bf4 100644
+--- a/subprojects/osgi/src/test/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifestTest.groovy
++++ b/subprojects/osgi/src/test/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifestTest.groovy
+@@ -15,7 +15,7 @@
+  */
+ package org.gradle.api.internal.plugins.osgi
+ 
+-import aQute.bnd.osgi.Analyzer
++import aQute.lib.osgi.Analyzer
+ import org.gradle.api.file.FileCollection
+ import org.gradle.api.internal.file.FileResolver
+ import org.gradle.api.java.archives.Attributes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git