Repository: hadoop Updated Branches: refs/heads/trunk da0b6a354 -> ad7469180
HADOOP-14798. Update sshd-core and related mina-core library versions. (rchiang) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ad746918 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ad746918 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ad746918 Branch: refs/heads/trunk Commit: ad74691807c51713bd9071e731d4481ee212567e Parents: da0b6a3 Author: Ray Chiang <rchi...@apache.org> Authored: Mon Sep 11 16:52:47 2017 -0700 Committer: Ray Chiang <rchi...@apache.org> Committed: Tue Sep 12 10:04:22 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/fs/sftp/TestSFTPFileSystem.java | 16 ++++++++-------- hadoop-project/pom.xml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad746918/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/sftp/TestSFTPFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/sftp/TestSFTPFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/sftp/TestSFTPFileSystem.java index e8eedd9..af48cb6 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/sftp/TestSFTPFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/sftp/TestSFTPFileSystem.java @@ -34,16 +34,16 @@ import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; 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.server.Command; -import org.apache.sshd.server.PasswordAuthenticator; -import org.apache.sshd.server.UserAuth; -import org.apache.sshd.server.auth.UserAuthPassword; +import org.apache.sshd.server.auth.password.PasswordAuthenticator; +import org.apache.sshd.server.auth.UserAuth; +import org.apache.sshd.server.auth.password.UserAuthPasswordFactory; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; 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.BeforeClass; import org.junit.Rule; @@ -76,7 +76,7 @@ public class TestSFTPFileSystem { List<NamedFactory<UserAuth>> userAuthFactories = new ArrayList<NamedFactory<UserAuth>>(); - userAuthFactories.add(new UserAuthPassword.Factory()); + userAuthFactories.add(new UserAuthPasswordFactory()); sshd.setUserAuthFactories(userAuthFactories); @@ -92,7 +92,7 @@ public class TestSFTPFileSystem { }); sshd.setSubsystemFactories( - Arrays.<NamedFactory<Command>>asList(new SftpSubsystem.Factory())); + Arrays.<NamedFactory<Command>>asList(new SftpSubsystemFactory())); sshd.start(); port = sshd.getPort(); @@ -140,7 +140,7 @@ public class TestSFTPFileSystem { if (sshd != null) { try { sshd.stop(true); - } catch (InterruptedException e) { + } catch (IOException e) { // ignore } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad746918/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index a414fcd..24c779c 100755 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -824,12 +824,12 @@ <dependency> <groupId>org.apache.mina</groupId> <artifactId>mina-core</artifactId> - <version>2.0.0-M5</version> + <version>2.0.16</version> </dependency> <dependency> <groupId>org.apache.sshd</groupId> <artifactId>sshd-core</artifactId> - <version>0.14.0</version> + <version>1.6.0</version> </dependency> <dependency> <groupId>org.apache.ftpserver</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org