commit 04ad9d7ec86952dc88aa27059238a42ba1a52e85
author David Pursehouse <dpursehouse@collab.net> Wed Jun 06 03:45:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 06 03:45:29 2018 +0000
tree 951af19e2be02329eaae7c9fae603f09a5f09cc1
parent 925528b840f0ea1cd80d26e14e6fa4a36ca52bf7
parent fba926e56cb8d46e81ee2e14e520de76e2aa5286

Merge "Update apache mina sshd to 1.7.0"

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 924eab8..9420a74 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -600,9 +600,9 @@
 # https://issues.apache.org/jira/browse/SSHD-736
 maven_jar(
     name = "sshd",
-    artifact = "org.apache.sshd:sshd-core:1.6.0",
+    artifact = "org.apache.sshd:sshd-core:1.7.0",
     exclude = ["META-INF/services/java.nio.file.spi.FileSystemProvider"],
-    sha1 = "548e2da643e88cda9d313efb2564a74f9943e491",
+    sha1 = "2e8b14f6d841b098e46bf407b6fdccab4c19fa41",
 )
 
 maven_jar(

java/com/google/gerrit/sshd/SshDaemon.java

diff --git a/java/com/google/gerrit/sshd/SshDaemon.java b/java/com/google/gerrit/sshd/SshDaemon.java
index c17c065..688c573 100644
--- a/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/java/com/google/gerrit/sshd/SshDaemon.java
@@ -71,7 +71,7 @@
 import org.apache.sshd.common.compression.BuiltinCompressions;
 import org.apache.sshd.common.compression.Compression;
 import org.apache.sshd.common.file.FileSystemFactory;
-import org.apache.sshd.common.forward.DefaultTcpipForwarderFactory;
+import org.apache.sshd.common.forward.DefaultForwarderFactory;
 import org.apache.sshd.common.future.CloseFuture;
 import org.apache.sshd.common.future.SshFutureListener;
 import org.apache.sshd.common.io.AbstractIoServiceFactory;
@@ -694,7 +694,7 @@
   }
 
   private void initForwarding() {
-    setTcpipForwardingFilter(
+    setForwardingFilter(
         new ForwardingFilter() {
           @Override
           public boolean canForwardAgent(Session session, String requestType) {
@@ -716,7 +716,7 @@
             return false;
           }
         });
-    setTcpipForwarderFactory(new DefaultTcpipForwarderFactory());
+    setForwarderFactory(new DefaultForwarderFactory());
   }
 
   private void initFileSystemFactory() {