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 2017/09/11 22:21:24 UTC
[2/2] karaf git commit: Merge branch 'KARAF-5358', fixes #351
Merge branch 'KARAF-5358', fixes #351
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7454bbc8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7454bbc8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7454bbc8
Branch: refs/heads/master
Commit: 7454bbc8612d51e76c48c51fa1946a9c0f2bfb2f
Parents: b4642cb 2a32ba2
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Sep 12 00:21:00 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Sep 12 00:21:00 2017 +0200
----------------------------------------------------------------------
.../internal/service/FeatureConfigInstaller.java | 7 +++----
.../test/java/org/apache/karaf/features/AppendTest.java | 4 +++-
pom.xml | 4 ++--
.../java/org/apache/karaf/profile/impl/Profiles.java | 12 +++++++++---
4 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7454bbc8/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c364d56,38a1084..31d03e1
--- a/pom.xml
+++ b/pom.xml
@@@ -190,11 -190,11 +190,11 @@@
<felix.configadmin.version>1.8.14</felix.configadmin.version>
<felix.connect.version>0.1.0</felix.connect.version>
<felix.coordinator.version>1.0.2</felix.coordinator.version>
- <felix.fileinstall.version>3.6.0</felix.fileinstall.version>
+ <felix.fileinstall.version>3.6.2</felix.fileinstall.version>
<felix.framework.version>5.6.6</felix.framework.version>
<felix.framework.security.version>2.6.0</felix.framework.security.version>
- <felix.gogo.runtime.version>1.0.6</felix.gogo.runtime.version>
- <felix.gogo.jline.version>1.0.6</felix.gogo.jline.version>
+ <felix.gogo.runtime.version>1.0.8</felix.gogo.runtime.version>
+ <felix.gogo.jline.version>1.0.8</felix.gogo.jline.version>
<felix.httplite.version>0.1.6</felix.httplite.version>
<felix.inventory.version>1.0.4</felix.inventory.version>
<felix.plugin.version>3.3.0</felix.plugin.version>