commit 92c171ef282020c9c7b97df8dd3f85e6e99d3ad6
author Jean-Baptiste Onofré <jbonofre@apache.org> Wed Dec 30 07:31:59 2020 +0100
committer GitHub <noreply@github.com> Wed Dec 30 07:31:59 2020 +0100
tree 2a0d44b8c4e80507f3648d616a78b015ce6abda3
parent 47a07b5d5e3e3b373545142e5c64324c85fb6224
parent d32ce538e3420b02142807762297e6e688ae4590

Merge pull request #1284 from jbonofre/KARAF-6979

[KARAF-6979] Upgrade to jline 3.18.0

pom.xml

diff --git a/pom.xml b/pom.xml
index b93cded..88fb779 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
         <httpclient.version>4.5.13</httpclient.version>
         <jansi.version>1.18</jansi.version>
         <javassist.version>3.9.0.GA</javassist.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>

shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java

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.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 boolean trackFocus(boolean tracking) {
         return terminal.trackFocus(tracking);
     }
+
+    @Override
+    public Size getBufferSize() {
+        return terminal.getBufferSize();
+    }
+
+    @Override
+    public ColorPalette getPalette() {
+        return terminal.getPalette();
+    }
 }