[karaf] branch karaf-4.2.x updated: [KARAF-6979] Upgrade to jline 3.18.0

[jbonofre]

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

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


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 597f10c  [KARAF-6979] Upgrade to jline 3.18.0
597f10c is described below

commit 597f10c60e44d74047fcd520ab4fb3cfc8af76f7
Author: jbonofre <jbono...@apache.org>
AuthorDate: Sun Dec 27 08:27:21 2020 +0100

    [KARAF-6979] Upgrade to jline 3.18.0
    
    (cherry picked from commit d32ce538e3420b02142807762297e6e688ae4590)
---
 pom.xml                                                       |  2 +-
 .../org/apache/karaf/shell/impl/console/JLineTerminal.java    | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e6d0785..888c1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,7 +265,7 @@
         <jansi.version>1.18</jansi.version>
         <javassist.version>3.9.0.GA</javassist.version>
         <jetty.version>9.4.35.v20201120</jetty.version>
-        <jline.version>3.17.1</jline.version>
+        <jline.version>3.18.0</jline.version>
         <junit.version>4.13.1</junit.version>
         <jsw.version>3.2.3</jsw.version>
         <log4j.version>1.2.17</log4j.version>
diff --git 
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
 
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
index df21c62..b884218 100644
--- 
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
+++ 
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
@@ -38,6 +38,7 @@ import org.jline.terminal.Attributes;
 import org.jline.terminal.Cursor;
 import org.jline.terminal.MouseEvent;
 import org.jline.terminal.Size;
+import org.jline.utils.ColorPalette;
 import org.jline.utils.InfoCmp.Capability;
 import org.jline.utils.NonBlockingReader;
 import org.slf4j.Logger;
@@ -338,4 +339,14 @@ public class JLineTerminal implements Terminal, 
org.jline.terminal.Terminal {
     public boolean trackFocus(boolean tracking) {
         return terminal.trackFocus(tracking);
     }
+
+    @Override
+    public Size getBufferSize() {
+        return terminal.getBufferSize();
+    }
+
+    @Override
+    public ColorPalette getPalette() {
+        return terminal.getPalette();
+    }
 }