Repository: karaf Updated Branches: refs/heads/master 62750e306 -> 46503d10e
[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/1590a9ad Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1590a9ad Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1590a9ad Branch: refs/heads/master Commit: 1590a9ad54ed97358d3d2e7f7181b62265c77263 Parents: c5d3a88 Author: Guillaume Nodet <gno...@gmail.com> Authored: Mon Sep 11 09:03:06 2017 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Tue Sep 12 19:13:11 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/1590a9ad/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8fa9035..e6fac94 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,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>3.5.0</maven.version> http://git-wip-us.apache.org/repos/asf/karaf/blob/1590a9ad/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 01986e2..7fd3ced 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 @@ -65,6 +65,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; @@ -410,7 +411,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();
