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 2019/01/28 16:29:45 UTC

[karaf] branch master updated: [KARAF-6096] Upgrade to Felix Gogo 1.1.4

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 87a240f  [KARAF-6096] Upgrade to Felix Gogo 1.1.4
     new a164f9e  Merge pull request #722 from jbonofre/KARAF-6096
87a240f is described below

commit 87a240f9145cd3e7ffddd9cdb8215c29e4161e59
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Jan 16 07:29:48 2019 +0100

    [KARAF-6096] Upgrade to Felix Gogo 1.1.4
---
 pom.xml            | 4 ++--
 shell/core/pom.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ed45d7..867a4d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,8 +200,8 @@
         <felix.fileinstall.version>3.6.4</felix.fileinstall.version>
         <felix.framework.version>5.6.10</felix.framework.version>
         <felix.framework.security.version>2.6.1</felix.framework.security.version>
-        <felix.gogo.runtime.version>1.1.0</felix.gogo.runtime.version>
-        <felix.gogo.jline.version>1.1.0</felix.gogo.jline.version>
+        <felix.gogo.runtime.version>1.1.2</felix.gogo.runtime.version>
+        <felix.gogo.jline.version>1.1.4</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>4.1.0</felix.plugin.version>
diff --git a/shell/core/pom.xml b/shell/core/pom.xml
index d8b3741..1a9975c 100644
--- a/shell/core/pom.xml
+++ b/shell/core/pom.xml
@@ -175,7 +175,8 @@
                             org.apache.felix.service.threadio,
                         </Private-Package>
                         <Provide-Capability>
-                            osgi.service;effective:=active;objectClass=org.apache.karaf.shell.api.console.SessionFactory
+                            osgi.service;effective:=active;objectClass=org.apache.karaf.shell.api.console.SessionFactory,
+                            org.apache.felix.gogo;org.apache.felix.gogo=command.implementation;version:Version="1.0.0"
                         </Provide-Capability>
                         <Bundle-Activator>
                             org.apache.karaf.shell.impl.console.osgi.Activator