[bnd] 01/01: Drop ant-1.9-compatibility.diff.

[Markus Koschany]

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

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

commit 0dcb4968bf6f184fa54d865599bbc9942a737756
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed May 6 23:31:43 2015 +0200

    Drop ant-1.9-compatibility.diff.
    
    This patch is obsolete with version 2.1.
---
 debian/patches/ant-1.9-compatibility.diff | 19 -------------------
 debian/patches/series                     |  1 -
 2 files changed, 20 deletions(-)

diff --git a/debian/patches/ant-1.9-compatibility.diff b/debian/patches/ant-1.9-compatibility.diff
deleted file mode 100644
index e52e159..0000000
--- a/debian/patches/ant-1.9-compatibility.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Ensures the source compatibility with Ant 1.9.
- This patch can be removed when upgrading to bnd 2.x.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
-@@ -1572,9 +1572,9 @@ public class Analyzer extends Processor {
- 		return sb.toString();
- 	}
- 
--	public void putAll(Map<String,String> additional, boolean force) {
--		for (Iterator<Map.Entry<String,String>> i = additional.entrySet().iterator(); i.hasNext();) {
--			Map.Entry<String,String> entry = i.next();
-+	public void putAll(Map<String,Object> additional, boolean force) {
-+		for (Iterator<Map.Entry<String,Object>> i = additional.entrySet().iterator(); i.hasNext();) {
-+			Map.Entry<String,Object> entry = i.next();
- 			if (force || getProperties().get(entry.getKey()) == null)
- 				setProperty(entry.getKey(), entry.getValue());
- 		}
diff --git a/debian/patches/series b/debian/patches/series
index 3408f36..baea1c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@ no_git_during_build.diff
 display_bsn_on_missing_bundle.diff
 #find_swt_jar.diff
 fix-encoding.diff
-ant-1.9-compatibility.diff
 #java8-compatibility.diff

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