[bnd] 01/01: Moved the changes to the Ant task into an independent patch

[Emmanuel Bourg]

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

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

commit e5f3fe44ee8e46e038445123bf72a1da5b56265c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 15 14:39:34 2018 +0100

    Moved the changes to the Ant task into an independent patch
---
 debian/patches/ant-compatibility.patch         | 14 ++++++++++++++
 debian/patches/implement-missing-methods.patch | 11 -----------
 debian/patches/series                          |  1 +
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/patches/ant-compatibility.patch b/debian/patches/ant-compatibility.patch
new file mode 100644
index 0000000..8aed6c3
--- /dev/null
+++ b/debian/patches/ant-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of Ant in Debian
+Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
+Forwarded: no
+--- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
++++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
+@@ -220,7 +220,7 @@
+ 				if (inherit) {
+ 					Properties projectProperties = new UTF8Properties();
+ 					@SuppressWarnings("unchecked")
+-					Hashtable<Object,Object> antProps = getProject().getProperties();
++					Hashtable<String,Object> antProps = getProject().getProperties();
+ 					projectProperties.putAll(antProps);
+ 					projectProperties.putAll(builder.getProperties());
+ 					builder.setProperties(projectProperties);
diff --git a/debian/patches/implement-missing-methods.patch b/debian/patches/implement-missing-methods.patch
index 177cb8d..ca3b7f0 100644
--- a/debian/patches/implement-missing-methods.patch
+++ b/debian/patches/implement-missing-methods.patch
@@ -97,14 +97,3 @@ Forwarded: no
 +		return null;
 +	}
  }
---- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
-@@ -220,7 +220,7 @@
- 				if (inherit) {
- 					Properties projectProperties = new UTF8Properties();
- 					@SuppressWarnings("unchecked")
--					Hashtable<Object,Object> antProps = getProject().getProperties();
-+					Hashtable<String,Object> antProps = getProject().getProperties();
- 					projectProperties.putAll(antProps);
- 					projectProperties.putAll(builder.getProperties());
- 					builder.setProperties(projectProperties);
diff --git a/debian/patches/series b/debian/patches/series
index 60deb51..7ebbb7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 display_bsn_on_missing_bundle.patch
 embedded-repo.patch
 implement-missing-methods.patch
+ant-compatibility.patch
 java8-compatibility.patch
 no-osgi-annotations.patch
 use-bootstrapped-gradle-plugin.patch

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