karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [2/2] karaf git commit: [KARAF-5025] Upgrade to Gogo 1.0.4
Date Mon, 13 Mar 2017 10:31:04 GMT
[KARAF-5025] Upgrade to Gogo 1.0.4

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ccd1ec69
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ccd1ec69
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ccd1ec69

Branch: refs/heads/master
Commit: ccd1ec69bf5574a5a0d3dfdb473f1121c4c2ae88
Parents: cef708f
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Mon Mar 13 11:23:33 2017 +0100
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Mon Mar 13 11:30:54 2017 +0100

----------------------------------------------------------------------
 pom.xml                                                          | 4 ++--
 .../karaf/shell/impl/console/osgi/secured/SecuredCommand.java    | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ccd1ec69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0682edd..a38ae0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,8 +187,8 @@
         <felix.fileinstall.version>3.5.8</felix.fileinstall.version>
         <felix.framework.version>5.6.2</felix.framework.version>
         <felix.framework.security.version>2.6.0</felix.framework.security.version>
-        <felix.gogo.runtime.version>1.0.2</felix.gogo.runtime.version>
-        <felix.gogo.jline.version>1.0.2</felix.gogo.jline.version>
+        <felix.gogo.runtime.version>1.0.4</felix.gogo.runtime.version>
+        <felix.gogo.jline.version>1.0.4</felix.gogo.jline.version>
         <felix.httplite.version>0.1.5</felix.httplite.version>
         <felix.inventory.version>1.0.4</felix.inventory.version>
         <felix.plugin.version>3.2.0</felix.plugin.version>

http://git-wip-us.apache.org/repos/asf/karaf/blob/ccd1ec69/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredCommand.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredCommand.java
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredCommand.java
index 67ecdb7..00c1d99 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredCommand.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredCommand.java
@@ -21,6 +21,7 @@ package org.apache.karaf.shell.impl.console.osgi.secured;
 import java.util.List;
 
 import org.apache.felix.gogo.runtime.Closure;
+import org.apache.felix.gogo.runtime.Token;
 import org.apache.felix.service.command.CommandSession;
 import org.apache.felix.service.command.Function;
 import org.apache.karaf.shell.api.console.Command;
@@ -78,6 +79,9 @@ public class SecuredCommand implements Command, Function {
                 final Closure closure = (Closure) v;
                 arguments.set(i, new VersatileFunction(closure));
             }
+            if (v instanceof Token) {
+                arguments.set(i, v.toString());
+            }
         }
         return execute(session, arguments);
     }


Mime
View raw message