You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/12/30 06:32:06 UTC
[karaf] branch master updated: [KARAF-6979] Upgrade to jline 3.18.0
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new d32ce53 [KARAF-6979] Upgrade to jline 3.18.0
new 92c171e Merge pull request #1284 from jbonofre/KARAF-6979
d32ce53 is described below
commit d32ce538e3420b02142807762297e6e688ae4590
Author: jbonofre <jb...@apache.org>
AuthorDate: Sun Dec 27 08:27:21 2020 +0100
[KARAF-6979] Upgrade to jline 3.18.0
---
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 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>
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();
+ }
}