Blame 0002-Fix-ant-compatibility.patch
|
Michael Simacek |
d47c92 |
From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001
|
|
Michael Simacek |
d47c92 |
From: Michael Simacek <msimacek@redhat.com>
|
|
Michael Simacek |
d47c92 |
Date: Tue, 12 Sep 2017 18:11:27 +0300
|
|
Michael Simacek |
d47c92 |
Subject: [PATCH 2/2] Fix ant compatibility
|
|
Michael Simacek |
d47c92 |
|
|
Michael Simacek |
d47c92 |
---
|
|
Michael Simacek |
d47c92 |
biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 2 +-
|
|
Michael Simacek |
d47c92 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Michael Simacek |
d47c92 |
|
|
Michael Simacek |
d47c92 |
diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
|
Michael Simacek |
d47c92 |
index aac8b8a..26dfe59 100644
|
|
Michael Simacek |
d47c92 |
--- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
|
Michael Simacek |
d47c92 |
+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
|
Michael Simacek |
d47c92 |
@@ -220,7 +220,7 @@ public class BndTask extends BaseTask {
|
|
Michael Simacek |
d47c92 |
if (inherit) {
|
|
Michael Simacek |
d47c92 |
Properties projectProperties = new UTF8Properties();
|
|
Michael Simacek |
d47c92 |
@SuppressWarnings("unchecked")
|
|
Michael Simacek |
d47c92 |
- Hashtable<Object,Object> antProps = getProject().getProperties();
|
|
Michael Simacek |
d47c92 |
+ Hashtable<String,Object> antProps = getProject().getProperties();
|
|
Michael Simacek |
d47c92 |
projectProperties.putAll(antProps);
|
|
Michael Simacek |
d47c92 |
projectProperties.putAll(builder.getProperties());
|
|
Michael Simacek |
d47c92 |
builder.setProperties(projectProperties);
|
|
Michael Simacek |
d47c92 |
--
|
|
Michael Simacek |
d47c92 |
2.13.5
|
|
Michael Simacek |
d47c92 |
|