You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/07/10 15:57:02 UTC
git commit: [KARAF-3110] Upgrade to felix utils 1.6.0 and revert the
previous fix for [KARAF-1560]
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 9c59314a4 -> 13d06fe24
[KARAF-3110] Upgrade to felix utils 1.6.0
and revert the previous fix for [KARAF-1560]
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/13d06fe2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/13d06fe2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/13d06fe2
Branch: refs/heads/karaf-2.x
Commit: 13d06fe24efcadddafdb734379e325ae6b833e1f
Parents: 9c59314
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jul 10 15:56:26 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jul 10 15:56:26 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
shell/config/pom.xml | 8 ++++----
.../org/apache/karaf/shell/config/ConfigCommandSupport.java | 3 +--
3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/13d06fe2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 902f491..9f02cd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
<felix.framework.security.version>2.4.0</felix.framework.security.version>
<felix.gogo.version>0.12.1</felix.gogo.version>
<felix.plugin.version>2.5.0</felix.plugin.version>
- <felix.utils.version>1.4.2</felix.utils.version>
+ <felix.utils.version>1.6.0</felix.utils.version>
<felix.webconsole.version>4.2.0</felix.webconsole.version>
<felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
<felix.metatype.version>1.0.10</felix.metatype.version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/13d06fe2/shell/config/pom.xml
----------------------------------------------------------------------
diff --git a/shell/config/pom.xml b/shell/config/pom.xml
index a03e44b..5f926bf 100644
--- a/shell/config/pom.xml
+++ b/shell/config/pom.xml
@@ -39,13 +39,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/13d06fe2/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
----------------------------------------------------------------------
diff --git a/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java b/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
index b1cf429..111bcf7 100644
--- a/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
+++ b/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java
@@ -182,8 +182,7 @@ public abstract class ConfigCommandSupport extends OsgiCommandSupport {
}
// remove "removed" properties from the file
ArrayList<String> propertiesToRemove = new ArrayList<String>();
- for (Object current : p.keySet()) {
- String key = (String) current;
+ for (String key : p.keySet()) {
if (props.get(key) == null
&& !Constants.SERVICE_PID.equals(key)
&& !ConfigurationAdmin.SERVICE_FACTORYPID.equals(key)