This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new 00d67de [KARAF-5497] Revert "[KARAF-5359] Upgrade to JLine 3.5.0"
00d67de is described below
commit 00d67ded1e427bb9a19a6b41a60111c4f92eb4f5
Author: Guillaume Nodet <[email protected]>
AuthorDate: Wed Nov 29 10:40:14 2017 +0100
[KARAF-5497] Revert "[KARAF-5359] Upgrade to JLine 3.5.0"
This reverts commit 05239d40b623d9146693e338d139a5b352e4197c.
---
pom.xml | 2 +-
.../java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index acadff7..0d02eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,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.5.0</jline.version>
+ <jline.version>3.4.0</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
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 a9564d3..1253967 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,7 +64,6 @@ 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;
@@ -346,7 +345,7 @@ public class ConsoleSessionImpl implements Session {
CharSequence command = null;
reading.set(true);
try {
- reader.readLine(getPrompt(), getRPrompt(),
(MaskingCallback) null, null);
+ reader.readLine(getPrompt(), getRPrompt(), null, null);
ParsedLine pl = reader.getParsedLine();
if (pl instanceof ParsedLineImpl) {
command = ((ParsedLineImpl) pl).program();
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
