Upgrade to latest gogo and sshd

jline · Feb 4, 2019 · b65cfe2 · b65cfe2
1 parent 310c846
commit b65cfe2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 6 deletions.
diff --git a/jline/pom.xml b/jline/pom.xml
@@ -43,6 +43,16 @@
             <artifactId>sshd-core</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-scp</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-sftp</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -81,11 +81,11 @@
         <jna.version>4.2.2</jna.version>
         <jansi.version>1.17.1</jansi.version>
         <juniversalchardet.version>1.0.3</juniversalchardet.version>
-        <sshd.version>1.4.0</sshd.version>
+        <sshd.version>2.1.0</sshd.version>
         <easymock.version>3.3.1</easymock.version>
         <junit.version>4.12</junit.version>
-        <gogo.runtime.version>1.1.0</gogo.runtime.version>
-        <gogo.jline.version>1.1.0</gogo.jline.version>
+        <gogo.runtime.version>1.1.2</gogo.runtime.version>
+        <gogo.jline.version>1.1.4</gogo.jline.version>
         <slf4j.version>1.7.21</slf4j.version>
         <findbugs.version>3.0.2</findbugs.version>
 
@@ -190,6 +190,18 @@
                 <version>${sshd.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-scp</artifactId>
+                <version>${sshd.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-sftp</artifactId>
+                <version>${sshd.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.gogo.runtime</artifactId>

diff --git a/remote-ssh/pom.xml b/remote-ssh/pom.xml
@@ -34,6 +34,18 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-scp</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-sftp</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellCommand.java b/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellCommand.java
@@ -15,10 +15,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.ExitCallback;
 import org.apache.sshd.server.SessionAware;
+import org.apache.sshd.server.command.Command;
 import org.apache.sshd.server.session.ServerSession;
 
 public class ShellCommand implements Command, SessionAware {

diff --git a/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellFactoryImpl.java b/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellFactoryImpl.java
@@ -17,11 +17,11 @@
 
 import org.apache.sshd.common.Factory;
 import org.apache.sshd.common.channel.PtyMode;
-import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.ExitCallback;
 import org.apache.sshd.server.SessionAware;
 import org.apache.sshd.server.Signal;
+import org.apache.sshd.server.command.Command;
 import org.apache.sshd.server.session.ServerSession;
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Attributes.ControlChar;
@@ -33,7 +33,7 @@
 import org.jline.terminal.TerminalBuilder;
 
 /**
- * SSHD {@link org.apache.sshd.server.Command} factory which provides access to
+ * SSHD {@link org.apache.sshd.server.command.Command} factory which provides access to
  * Shell.
  */
 public class ShellFactoryImpl implements Factory<Command> {