Repository: karaf Updated Branches: refs/heads/karaf-4.1.x 209cd1871 -> 1f1e35df3 (forced update)
[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/1f1e35df Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1f1e35df Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1f1e35df Branch: refs/heads/karaf-4.1.x Commit: 1f1e35df33e3a69b446dc364b13ba0865d5e19be Parents: da6de53 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon May 29 14:31:29 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon May 29 15:13:28 2017 +0200 ---------------------------------------------------------------------- pom.xml | 4 ++-- profile/src/main/java/org/apache/karaf/profile/impl/Utils.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/1f1e35df/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> http://git-wip-us.apache.org/repos/asf/karaf/blob/1f1e35df/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); } }
