karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [2/2] karaf git commit: [KARAF-5112][KARAF-5113][KARAF-5114] Upgrade gogo, jansi, jline
Date Sat, 13 May 2017 00:32:23 GMT
[KARAF-5112][KARAF-5113][KARAF-5114] Upgrade gogo, jansi, jline

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/75be64c2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/75be64c2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/75be64c2

Branch: refs/heads/karaf-4.1.x
Commit: 75be64c2c547735e393f6b94757b66da4161dae2
Parents: 051e488
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Sat May 13 02:32:14 2017 +0200
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Sat May 13 02:32:14 2017 +0200

----------------------------------------------------------------------
 pom.xml                                                     | 8 ++++----
 .../apache/karaf/shell/impl/console/ConsoleSessionImpl.java | 6 +++++-
 .../org/apache/karaf/shell/impl/console/HistoryWrapper.java | 9 ++++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/75be64c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 22e1697..5f5c3b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,8 +187,8 @@
         <felix.fileinstall.version>3.5.8</felix.fileinstall.version>
         <felix.framework.version>5.6.2</felix.framework.version>
         <felix.framework.security.version>2.6.0</felix.framework.security.version>
-        <felix.gogo.runtime.version>1.0.4</felix.gogo.runtime.version>
-        <felix.gogo.jline.version>1.0.4</felix.gogo.jline.version>
+        <felix.gogo.runtime.version>1.0.6</felix.gogo.runtime.version>
+        <felix.gogo.jline.version>1.0.6</felix.gogo.jline.version>
         <felix.httplite.version>0.1.5</felix.httplite.version>
         <felix.inventory.version>1.0.4</felix.inventory.version>
         <felix.plugin.version>3.3.0</felix.plugin.version>
@@ -247,9 +247,9 @@
         <hibernate43.version>4.3.6.Final</hibernate43.version>
         <hibernate.version>5.2.8.Final</hibernate.version>
         <hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
-        <jansi.version>1.14</jansi.version>
+        <jansi.version>1.16</jansi.version>
         <javassist.version>3.9.0.GA</javassist.version>
-        <jline.version>3.2.0</jline.version>
+        <jline.version>3.3.0</jline.version>
         <jsw.version>3.2.3</jsw.version>
         <log4j.version>1.2.17</log4j.version>
         <maven.version>2.0.9</maven.version>

http://git-wip-us.apache.org/repos/asf/karaf/blob/75be64c2/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
----------------------------------------------------------------------
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 62636a1..5f1d7aa 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
@@ -272,7 +272,11 @@ public class ConsoleSessionImpl implements Session {
 
     public void close() {
         if (running) {
-            reader.getHistory().save();
+            try {
+                reader.getHistory().save();
+            } catch (IOException e) {
+                // ignore
+            }
 
             running = false;
             if (thread != Thread.currentThread()) {

http://git-wip-us.apache.org/repos/asf/karaf/blob/75be64c2/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HistoryWrapper.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HistoryWrapper.java
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HistoryWrapper.java
index 25f0dff..13402eb 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HistoryWrapper.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HistoryWrapper.java
@@ -20,6 +20,9 @@ package org.apache.karaf.shell.impl.console;
 
 import org.apache.karaf.shell.api.console.History;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+
 public class HistoryWrapper implements History {
 
     private final org.jline.reader.History history;
@@ -30,7 +33,11 @@ public class HistoryWrapper implements History {
 
     @Override
     public void clear() {
-        history.purge();
+        try {
+            history.purge();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
     public int first() {


Mime
View raw message