Upgrade to SSHD 0.10.1 and provided a temporary workaround because of http://sourceforge.net/p/jsch/bugs/63
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/af9e3898 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af9e3898 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af9e3898 Branch: refs/heads/camel-2.13.x Commit: af9e3898508ef838274d44117b2be33b5956fe57 Parents: 7516fdb Author: Babak Vahdat <bvah...@apache.org> Authored: Sun Mar 16 21:51:16 2014 +0100 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Mar 17 17:04:59 2014 +0800 ---------------------------------------------------------------------- .../org/apache/camel/component/jsch/ScpServerTestSupport.java | 5 ++++- .../org/apache/camel/component/ssh/FileKeyPairProvider.java | 5 +++-- .../camel/component/ssh/ResourceHelperKeyPairProvider.java | 4 ++-- parent/pom.xml | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/af9e3898/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java index 8d56ff1..1213e9d 100644 --- a/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java +++ b/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java @@ -178,7 +178,10 @@ public abstract class ScpServerTestSupport extends CamelTestSupport { jsch.setKnownHosts(knownHostsFile); Session s = jsch.getSession("admin", "localhost", getPort()); s.setConfig("StrictHostKeyChecking", "ask"); - s.setConfig("HashKnownHosts", "yes"); + + // TODO: by the current jsch (0.1.50) setting "HashKnownHosts" to "no" is a workaround + // to make the tests run green, see also http://sourceforge.net/p/jsch/bugs/63/ + s.setConfig("HashKnownHosts", "no"); s.setUserInfo(new UserInfo() { @Override public String getPassphrase() { http://git-wip-us.apache.org/repos/asf/camel/blob/af9e3898/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java index 02a2f00..6ed9b9b 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java @@ -73,7 +73,8 @@ public class FileKeyPairProvider extends AbstractKeyPairProvider { this.passwordFinder = passwordFinder; } - public KeyPair[] loadKeys() { + @Override + public Iterable<KeyPair> loadKeys() { if (!SecurityUtils.isBouncyCastleRegistered()) { throw new IllegalStateException("BouncyCastle must be registered as a JCE provider"); } @@ -106,7 +107,7 @@ public class FileKeyPairProvider extends AbstractKeyPairProvider { log.warn("Unable to read key {}: {}", files[i], e); } } - return keys.toArray(new KeyPair[keys.size()]); + return keys; } } http://git-wip-us.apache.org/repos/asf/camel/blob/af9e3898/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceHelperKeyPairProvider.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceHelperKeyPairProvider.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceHelperKeyPairProvider.java index 9457b05..0116e3d 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceHelperKeyPairProvider.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceHelperKeyPairProvider.java @@ -95,7 +95,7 @@ public class ResourceHelperKeyPairProvider extends AbstractKeyPairProvider { } @Override - protected KeyPair[] loadKeys() { + public Iterable<KeyPair> loadKeys() { if (!SecurityUtils.isBouncyCastleRegistered()) { throw new IllegalStateException("BouncyCastle must be registered as a JCE provider"); } @@ -136,7 +136,7 @@ public class ResourceHelperKeyPairProvider extends AbstractKeyPairProvider { } } - return keys.toArray(new KeyPair[keys.size()]); + return keys; } } http://git-wip-us.apache.org/repos/asf/camel/blob/af9e3898/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9cd06e3..219f21e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -391,7 +391,7 @@ <spring-ws-version>2.1.4.RELEASE</spring-ws-version> <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! --> <spymemcached-version>2.8.4</spymemcached-version> - <sshd-version>0.9.0</sshd-version> + <sshd-version>0.10.1</sshd-version> <stompjms-version>1.19</stompjms-version> <stax-api-version>1.0.1</stax-api-version> <stax2-api-bundle-version>3.1.1</stax2-api-bundle-version>
