Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 3fce9dcaf -> a31f62598
[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/a31f6259 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a31f6259 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a31f6259 Branch: refs/heads/karaf-4.0.x Commit: a31f62598f9ef761d5b57053f2960e1b52fdf07a Parents: 3fce9dc 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:12:51 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/a31f6259/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f461e65..f484e96 100644 --- a/pom.xml +++ b/pom.xml @@ -187,8 +187,8 @@ <felix.gogo.version>0.16.2</felix.gogo.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/a31f6259/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); } }
