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/04/09 06:16:02 UTC

[karaf] branch karaf-4.2.x updated: [KARAF-6628] Upgrade to jline 3.14.1

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 13081bb  [KARAF-6628] Upgrade to jline 3.14.1
13081bb is described below

commit 13081bbcd0d7d0faaec86070f01c8206e6d8e7a2
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed Apr 8 13:17:55 2020 +0200

    [KARAF-6628] Upgrade to jline 3.14.1
    
    (cherry picked from commit 405b6af2b2fe59a71c050beeab39a6a5e36adf8c)
---
 pom.xml                                                                | 2 +-
 .../main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60296c4..79904ce 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.22.v20191022</jetty.version>
-        <jline.version>3.13.2</jline.version>
+        <jline.version>3.14.1</jline.version>
         <junit.version>4.13</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/KarafTerminal.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
index f6eec8e..ed4d84c 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
@@ -101,8 +101,5 @@ public class KarafTerminal extends AbstractTerminal implements org.jline.termina
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void close() throws IOException {
-    }
 }