diff --git a/pom.xml b/pom.xml index 9ac0bddebb8..f497032c69f 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ 3.4.4_1 4.0.1 8.5.61 - 1.0.0-build222 + build-217-jenkins-27 6.7 0.5.0 6.2.0-3.1 @@ -334,7 +334,7 @@ ${cs.xstream.version} - com.trilead + org.jenkins-ci trilead-ssh2 ${cs.trilead.version} @@ -739,6 +739,20 @@ + + + repo.jenkins-ci.org.releases + http://repo.jenkins-ci.org/releases/ + + false + + + + repo.jenkins-ci.org.public + http://repo.jenkins-ci.org/public/ + + + install diff --git a/test/pom.xml b/test/pom.xml index 41112bf7ac1..735bcf26505 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -37,7 +37,7 @@ log4j - com.trilead + org.jenkins-ci trilead-ssh2 diff --git a/utils/pom.xml b/utils/pom.xml index 8612e8a25dc..481631d3cdd 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -79,8 +79,9 @@ jasypt - com.trilead + org.jenkins-ci trilead-ssh2 + ${cs.trilead.version} com.amazonaws diff --git a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java index 537ebe7277b..d5cd91aff76 100644 --- a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java +++ b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java @@ -260,7 +260,7 @@ public class SshHelper { * does not have an exit status, it returns true to break the loop; otherwise, it returns * false. */ - protected static boolean canEndTheSshConnection(int waitResultTimeoutInMs, com.trilead.ssh2.Session sess, int conditions) throws SshException { + protected static boolean canEndTheSshConnection(int waitResultTimeoutInMs, com.trilead.ssh2.Session sess, int conditions) throws SshException, InterruptedException { if (isChannelConditionEof(conditions)) { int newConditions = sess.waitForCondition(ChannelCondition.EXIT_STATUS, waitResultTimeoutInMs); throwSshExceptionIfConditionsTimeout(newConditions);