You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/05/29 12:53:56 UTC
[1/2] karaf git commit: [KARAF-5159] Upgrade to Felix WebConsole 4.3.4
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x da6de53cb -> 209cd1871
[KARAF-5159] Upgrade to Felix WebConsole 4.3.4
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b3f81b47
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b3f81b47
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b3f81b47
Branch: refs/heads/karaf-4.1.x
Commit: b3f81b47c39b0a1d27d72362c801063e8f545d48
Parents: da6de53
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon May 29 14:31:29 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon May 29 14:32:35 2017 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b3f81b47/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 878af62..450e4c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,8 +192,8 @@
<felix.httplite.version>0.1.5</felix.httplite.version>
<felix.inventory.version>1.0.4</felix.inventory.version>
<felix.plugin.version>3.3.0</felix.plugin.version>
- <felix.utils.version>1.9.0</felix.utils.version>
- <felix.webconsole.version>4.3.0</felix.webconsole.version>
+ <felix.utils.version>1.10.0</felix.utils.version>
+ <felix.webconsole.version>4.3.4</felix.webconsole.version>
<felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
<felix.metatype.version>1.1.2</felix.metatype.version>
<felix.eventadmin.version>1.4.8</felix.eventadmin.version>
[2/2] karaf git commit: Fix profile utils
Posted by jb...@apache.org.
Fix profile utils
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/209cd187
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/209cd187
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/209cd187
Branch: refs/heads/karaf-4.1.x
Commit: 209cd18718cc8ac0a3781c36544caa285cf7b962
Parents: b3f81b4
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon May 29 14:53:44 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon May 29 14:53:44 2017 +0200
----------------------------------------------------------------------
profile/src/main/java/org/apache/karaf/profile/impl/Utils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/209cd187/profile/src/main/java/org/apache/karaf/profile/impl/Utils.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/impl/Utils.java b/profile/src/main/java/org/apache/karaf/profile/impl/Utils.java
index 7bc016a..6454223 100644
--- a/profile/src/main/java/org/apache/karaf/profile/impl/Utils.java
+++ b/profile/src/main/java/org/apache/karaf/profile/impl/Utils.java
@@ -91,7 +91,7 @@ public final class Utils {
Properties rc = new Properties(false);
rc.putAll(source);
return rc;
- } catch (IOException ex) {
+ } catch (Exception ex) {
throw new IllegalArgumentException("Cannot load properties", ex);
}
}