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/12 18:44:54 UTC
karaf git commit: [KARAF-5359] Upgrade to JLine 3.5.0
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x 49e1b8e5d -> 05239d40b
[KARAF-5359] Upgrade to JLine 3.5.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/05239d40
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/05239d40
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/05239d40
Branch: refs/heads/karaf-4.1.x
Commit: 05239d40b623d9146693e338d139a5b352e4197c
Parents: 49e1b8e
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Sep 11 09:03:06 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Sep 12 20:44:50 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/05239d40/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f727658..d4f6881 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,7 @@
<hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
<jansi.version>1.16</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jline.version>3.4.0</jline.version>
+ <jline.version>3.5.0</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/05239d40/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index 1253967..a9564d3 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -64,6 +64,7 @@ import org.jline.reader.Completer;
import org.jline.reader.EndOfFileException;
import org.jline.reader.LineReader;
import org.jline.reader.LineReaderBuilder;
+import org.jline.reader.MaskingCallback;
import org.jline.reader.ParsedLine;
import org.jline.reader.UserInterruptException;
import org.jline.terminal.Terminal.Signal;
@@ -345,7 +346,7 @@ public class ConsoleSessionImpl implements Session {
CharSequence command = null;
reading.set(true);
try {
- reader.readLine(getPrompt(), getRPrompt(), null, null);
+ reader.readLine(getPrompt(), getRPrompt(), (MaskingCallback) null, null);
ParsedLine pl = reader.getParsedLine();
if (pl instanceof ParsedLineImpl) {
command = ((ParsedLineImpl) pl).program();