You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2017/08/18 17:50:44 UTC
camel git commit: CAMEL-11638: upgrade camel-jsch to use apache-sshd
version 1.6.0
Repository: camel
Updated Branches:
refs/heads/master bbbc5d5ca -> bc3677e52
CAMEL-11638: upgrade camel-jsch to use apache-sshd version 1.6.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc3677e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc3677e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc3677e5
Branch: refs/heads/master
Commit: bc3677e521e1e87837d74b21ec33709fe23d9e3b
Parents: bbbc5d5
Author: Babak Vahdat <bv...@apache.org>
Authored: Fri Aug 18 19:50:37 2017 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Fri Aug 18 19:50:37 2017 +0200
----------------------------------------------------------------------
.../camel/component/scp/ScpServerTestSupport.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bc3677e5/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
index acb2f15..a85c644 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.scp;
import java.io.IOException;
+import java.nio.file.Paths;
import java.security.Provider;
import java.security.Provider.Service;
import java.security.PublicKey;
@@ -30,15 +31,15 @@ import com.jcraft.jsch.UserInfo;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.sshd.SshServer;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.server.Command;
-import org.apache.sshd.server.PasswordAuthenticator;
-import org.apache.sshd.server.PublickeyAuthenticator;
-import org.apache.sshd.server.command.ScpCommandFactory;
+import org.apache.sshd.server.SshServer;
+import org.apache.sshd.server.auth.password.PasswordAuthenticator;
+import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
+import org.apache.sshd.server.scp.ScpCommandFactory;
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.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -119,8 +120,8 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
protected boolean startSshd() {
sshd = SshServer.setUpDefaultServer();
sshd.setPort(getPort());
- sshd.setKeyPairProvider(new FileKeyPairProvider(new String[]{"src/test/resources/hostkey.pem"}));
- sshd.setSubsystemFactories(Arrays.<NamedFactory<Command>>asList(new SftpSubsystem.Factory()));
+ sshd.setKeyPairProvider(new FileKeyPairProvider(Paths.get("src/test/resources/hostkey.pem")));
+ sshd.setSubsystemFactories(Arrays.asList(new SftpSubsystemFactory()));
sshd.setCommandFactory(new ScpCommandFactory());
sshd.setPasswordAuthenticator(new PasswordAuthenticator() {
@Override