You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1019 B
26 lines
1019 B
6 months ago
|
From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Simacek <msimacek@redhat.com>
|
||
|
|
Date: Tue, 12 Sep 2017 18:11:27 +0300
|
||
|
|
Subject: [PATCH 2/2] Fix ant compatibility
|
||
|
|
|
||
|
|
---
|
||
|
|
biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
||
|
|
index dd438a5..6b714be 100644
|
||
|
|
--- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
||
|
|
+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
|
||
|
|
@@ -220,7 +220,7 @@ public class BndTask extends BaseTask {
|
||
|
|
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);
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|