Upgrade apache_sshd CL #2: Update to v1_2_0

This changelist makes the newly added v1_2_0 the default and fixes incompatibilities
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=125609347
This commit is contained in:
Ben McIlwain 2016-06-22 14:30:13 -07:00
parent 744648b5d3
commit 84eb3c8666
5 changed files with 67 additions and 191 deletions

View file

@ -20,7 +20,6 @@ import google.registry.util.NetworkUtils;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.sshd.server.session.SessionFactory;
import org.junit.rules.ExternalResource;
import java.io.File;
@ -60,8 +59,7 @@ public final class SftpServerRule extends ExternalResource {
private static FtpServer createSftpServer(String user, String pass, File home, int port)
throws FtpException {
FtpServer server =
TestSftpServer.createSftpServer(user, pass, null, port, home, new SessionFactory());
FtpServer server = TestSftpServer.createSftpServer(user, pass, null, port, home);
server.start();
return server;
}