|
 |
cd88f5 |
From aff3baf83b795f99494b2d5bead1a6ee0c654fc5 Mon Sep 17 00:00:00 2001
|
|
|
cd88f5 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
cd88f5 |
Date: Thu, 19 Sep 2013 13:49:07 +0200
|
|
|
cd88f5 |
Subject: [PATCH] Port to Ant 1.9
|
|
|
cd88f5 |
|
|
|
cd88f5 |
---
|
|
|
cd88f5 |
OSGI-OPT/src/aQute/bnd/main/bnd.java | 2 +-
|
|
|
cd88f5 |
OSGI-OPT/src/aQute/lib/osgi/Analyzer.java | 6 +++---
|
|
|
cd88f5 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
cd88f5 |
|
|
|
cd88f5 |
diff --git a/OSGI-OPT/src/aQute/bnd/main/bnd.java b/OSGI-OPT/src/aQute/bnd/main/bnd.java
|
|
|
cd88f5 |
index 71e4483..3ec33bc 100644
|
|
|
cd88f5 |
--- a/OSGI-OPT/src/aQute/bnd/main/bnd.java
|
|
|
cd88f5 |
+++ b/OSGI-OPT/src/aQute/bnd/main/bnd.java
|
|
|
cd88f5 |
@@ -1020,7 +1020,7 @@ public class bnd extends Processor {
|
|
|
cd88f5 |
}
|
|
|
cd88f5 |
|
|
|
cd88f5 |
public boolean doWrap(File properties, File bundle, File output,
|
|
|
cd88f5 |
- File classpath[], int options, Map<String, String> additional)
|
|
|
cd88f5 |
+ File classpath[], int options, Map<String, Object> additional)
|
|
|
cd88f5 |
throws Exception {
|
|
|
cd88f5 |
if (!bundle.exists()) {
|
|
|
cd88f5 |
error("No such file: " + bundle.getAbsolutePath());
|
|
|
cd88f5 |
diff --git a/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java b/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java
|
|
|
cd88f5 |
index 0a10d42..c6591fd 100644
|
|
|
cd88f5 |
--- a/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java
|
|
|
cd88f5 |
+++ b/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java
|
|
|
cd88f5 |
@@ -1216,10 +1216,10 @@ public class Analyzer extends Processor {
|
|
|
cd88f5 |
return sb.toString();
|
|
|
cd88f5 |
}
|
|
|
cd88f5 |
|
|
|
cd88f5 |
- public void putAll(Map<String, String> additional, boolean force) {
|
|
|
cd88f5 |
- for (Iterator<Map.Entry<String, String>> i = additional.entrySet()
|
|
|
cd88f5 |
+ public void putAll(Map<String, Object> additional, boolean force) {
|
|
|
cd88f5 |
+ for (Iterator<Map.Entry<String, Object>> i = additional.entrySet()
|
|
|
cd88f5 |
.iterator(); i.hasNext();) {
|
|
|
cd88f5 |
- Map.Entry<String, String> entry = i.next();
|
|
|
cd88f5 |
+ Map.Entry<String, Object> entry = i.next();
|
|
|
cd88f5 |
if (force || getProperties().get(entry.getKey()) == null)
|
|
|
cd88f5 |
setProperty((String) entry.getKey(), (String) entry.getValue());
|
|
|
cd88f5 |
}
|
|
|
cd88f5 |
--
|
|
|
cd88f5 |
1.8.1.4
|
|
|
cd88f5 |
|