Author: gnodet
Date: Sat Sep 17 18:18:30 2016
New Revision: 1761261

URL: http://svn.apache.org/viewvc?rev=1761261&view=rev
Log:
[FELIX-5272] Upgrade to jline 3.0.0.M2

Modified:
    felix/trunk/gogo/jline/pom.xml
    
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
    felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
    felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Parser.java

Modified: felix/trunk/gogo/jline/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/pom.xml?rev=1761261&r1=1761260&r2=1761261&view=diff
==============================================================================
--- felix/trunk/gogo/jline/pom.xml (original)
+++ felix/trunk/gogo/jline/pom.xml Sat Sep 17 18:18:30 2016
@@ -52,10 +52,9 @@
             <version>0.17.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>jline</groupId>
+            <groupId>org.jline</groupId>
             <artifactId>jline</artifactId>
-            <version>3.0.0.M1</version>
-            <optional>true</optional>
+            <version>3.0.0.M2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>

Modified: 
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java?rev=1761261&r1=1761260&r2=1761261&view=diff
==============================================================================
--- 
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java 
(original)
+++ 
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Activator.java 
Sat Sep 17 18:18:30 2016
@@ -129,7 +129,11 @@ public class Activator implements Bundle
 
     private void doStartShell(CommandProcessor processor, Shell shell) {
         String errorMessage = "gogo: unable to create console";
-        try (Terminal terminal = TerminalBuilder.terminal();
+        try (Terminal terminal = TerminalBuilder.builder()
+                .system(true)
+                .nativeSignals(true)
+                .signalHandler(Terminal.SignalHandler.SIG_IGN)
+                .build();
              CommandSession session = 
processor.createSession(terminal.input(), terminal.output(), 
terminal.output())) {
             session.put(Shell.VAR_TERMINAL, terminal);
             try {

Modified: 
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java?rev=1761261&r1=1761260&r2=1761261&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java 
(original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Main.java 
Sat Sep 17 18:18:30 2016
@@ -41,6 +41,8 @@ public class Main {
                 .type(System.getenv("TERM"))
                 .system(true)
                 .streams(sin, sout)
+                .nativeSignals(true)
+                .signalHandler(Terminal.SignalHandler.SIG_IGN)
                 .build()) {
             ThreadIOImpl tio = new ThreadIOImpl();
             tio.start();

Modified: 
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Parser.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Parser.java?rev=1761261&r1=1761260&r2=1761261&view=diff
==============================================================================
--- 
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Parser.java 
(original)
+++ 
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Parser.java 
Sat Sep 17 18:18:30 2016
@@ -30,7 +30,7 @@ import org.jline.reader.ParsedLine;
 
 public class Parser implements org.jline.reader.Parser {
 
-    public ParsedLine parse(String line, int cursor) throws 
org.jline.reader.SyntaxError {
+    public ParsedLine parse(String line, int cursor, ParseContext context) 
throws org.jline.reader.SyntaxError {
         try {
             return doParse(line, cursor);
         } catch (EOFError e) {


Reply via email to