Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14798. Update sshd-core and related mina-core library versions. (rchiang)

This commit is contained in:
Ray Chiang 2017-09-11 16:52:47 -07:00
parent da0b6a354b
commit ad74691807
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/sftp/TestSFTPFileSystem.java
View File

@ -34,16 +34,16 @@ import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.GenericTestUtils;
import org.apache.sshd.SshServer; import org.apache.sshd.server.SshServer;
import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.server.Command; import org.apache.sshd.server.Command;
import org.apache.sshd.server.PasswordAuthenticator; import org.apache.sshd.server.auth.password.PasswordAuthenticator;
import org.apache.sshd.server.UserAuth; import org.apache.sshd.server.auth.UserAuth;
import org.apache.sshd.server.auth.UserAuthPassword; import org.apache.sshd.server.auth.password.UserAuthPasswordFactory;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession; import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.sftp.SftpSubsystem;
import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule; import org.junit.Rule;
@ -76,7 +76,7 @@ public class TestSFTPFileSystem {
List<NamedFactory<UserAuth>> userAuthFactories = List<NamedFactory<UserAuth>> userAuthFactories =
new ArrayList<NamedFactory<UserAuth>>(); new ArrayList<NamedFactory<UserAuth>>();
userAuthFactories.add(new UserAuthPassword.Factory()); userAuthFactories.add(new UserAuthPasswordFactory());
sshd.setUserAuthFactories(userAuthFactories); sshd.setUserAuthFactories(userAuthFactories);
@ -92,7 +92,7 @@ public class TestSFTPFileSystem {
}); });
sshd.setSubsystemFactories( sshd.setSubsystemFactories(
Arrays.<NamedFactory<Command>>asList(new SftpSubsystem.Factory())); Arrays.<NamedFactory<Command>>asList(new SftpSubsystemFactory()));
sshd.start(); sshd.start();
port = sshd.getPort(); port = sshd.getPort();
@ -140,7 +140,7 @@ public class TestSFTPFileSystem {
if (sshd != null) { if (sshd != null) {
try { try {
sshd.stop(true); sshd.stop(true);
} catch (InterruptedException e) { } catch (IOException e) {
// ignore // ignore
} }
} }

4
hadoop-project/pom.xml
View File

@ -824,12 +824,12 @@
<dependency> <dependency>
<groupId>org.apache.mina</groupId> <groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId> <artifactId>mina-core</artifactId>
<version>2.0.0-M5</version> <version>2.0.16</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.sshd</groupId> <groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId> <artifactId>sshd-core</artifactId>
<version>0.14.0</version> <version>1.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ftpserver</groupId> <groupId>org.apache.ftpserver</groupId>