You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/10/17 10:40:37 UTC
[44/50] git commit: upgraded jsch 0.1.50 to 0.1.51 and fixed the
failing unit tests
upgraded jsch 0.1.50 to 0.1.51 and fixed the failing unit tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b1379c6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1379c6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1379c6c
Branch: refs/remotes/origin/camel-2.13.x
Commit: b1379c6cf24add7da74995bcfe7968ddb436c4ae
Parents: 21ff698
Author: Christian Mueller <cm...@apache.org>
Authored: Wed Oct 15 20:13:25 2014 +0200
Committer: Christian Mueller <cm...@apache.org>
Committed: Wed Oct 15 20:13:25 2014 +0200
----------------------------------------------------------------------
.../camel/component/jsch/ScpServerTestSupport.java | 11 +++--------
components/camel-jsch/src/test/resources/scp/known_hosts | 0
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b1379c6c/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 1213e9d..8793f44 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
@@ -48,12 +48,9 @@ import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * @version
- */
public abstract class ScpServerTestSupport extends CamelTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(ScpServerTestSupport.class);
- protected static final String SCP_ROOT_DIR = "target/scp";
+ protected static final String SCP_ROOT_DIR = "target/test-classes/scp";
protected static final String KNOWN_HOSTS = "known_hosts";
protected static int port;
@@ -109,7 +106,6 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
// and get errors when the ssh server is stopping.
}
}
- FileUtil.deleteFile(new File(knownHostsFile));
deleteDirectory(getScpPath());
}
@@ -153,8 +149,7 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
}
protected void setupKnownHosts() {
- knownHostsFile = SCP_ROOT_DIR + "/" + KNOWN_HOSTS + "-" + getPort();
- FileUtil.deleteFile(new File(knownHostsFile));
+ knownHostsFile = SCP_ROOT_DIR + "/" + KNOWN_HOSTS;
if (!acceptLocalhostConnections) {
return;
}
@@ -163,7 +158,7 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
// camel-jsch will only connect to known hosts. For unit testing
// we use a known key, but since the port it dynamic, the
// known_hosts file will be generated by the following code and
- // should should contain a line like below (if
+ // should contain a line like below (if
// "HashKnownHosts"=="yes" the hostname:port part will be
// hashed and look a bit more complicated).
//
http://git-wip-us.apache.org/repos/asf/camel/blob/b1379c6c/components/camel-jsch/src/test/resources/scp/known_hosts
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/test/resources/scp/known_hosts b/components/camel-jsch/src/test/resources/scp/known_hosts
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/camel/blob/b1379c6c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 75cd7bf..e2a0d93 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -241,7 +241,7 @@
<jruby-version>1.7.13</jruby-version>
<jsendnsca-version>1.3.1</jsendnsca-version>
<jsmpp-version>2.1.0_4</jsmpp-version>
- <jsch-version>0.1.50</jsch-version>
+ <jsch-version>0.1.51</jsch-version>
<jsch-bundle-version>0.1.50_1</jsch-bundle-version>
<jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
<jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>