[gradle] 01/02: Drop use-bndlib-1.50.0.patch and transition to bnd 2.1.0.

[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 989107f1f6af3e2a0f2aca613781d7c8c828cf76
Author: Markus Koschany <apo at debian.org>
Date:   Tue Nov 17 20:41:38 2015 +0100

    Drop use-bndlib-1.50.0.patch and transition to bnd 2.1.0.
---
 debian/control                         |  4 +-
 debian/patches/series                  |  1 -
 debian/patches/use-bndlib-1.50.0.patch | 70 ----------------------------------
 3 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/debian/control b/debian/control
index 6514ca8..53a88e7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Miguel Landaeta <miguel at miguel.cc>,
 Section: java
 Priority: optional
 Build-Depends: ant,
-               bnd,
+               bnd (>= 2.1.0),
                checkstyle,
                debhelper (>= 9),
                default-jdk (>= 1:1.6),
@@ -145,7 +145,7 @@ Description: Powerful build system for the JVM - Core libraries
 
 Package: libgradle-plugins-java
 Architecture: all
-Depends: bnd,
+Depends: bnd (>= 2.1.0),
          findbugs,
          junit4,
          libantlr-java,
diff --git a/debian/patches/series b/debian/patches/series
index 70a8a5a..3f75ad1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,7 +19,6 @@ disable_java9.diff
 eclipse-aether.diff
 maven-aether-provider.diff
 maven_builder_support.diff
-use-bndlib-1.50.0.patch
 generate_classpath.diff
 generate_pom.diff
 ivy-2.4.0.patch
diff --git a/debian/patches/use-bndlib-1.50.0.patch b/debian/patches/use-bndlib-1.50.0.patch
deleted file mode 100644
index 328a25b..0000000
--- a/debian/patches/use-bndlib-1.50.0.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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