This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.15 by this push:
new 7208fac mvn: using forked version of trilead-ssh2 (from
org.jenkins-ci) (#4099)
7208fac is described below
commit 7208fac18be25c6518fd0fe5dd7efcba08b4e714
Author: Miklos Barabas <[email protected]>
AuthorDate: Wed Apr 7 07:54:07 2021 +0200
mvn: using forked version of trilead-ssh2 (from org.jenkins-ci) (#4099)
* using forked version of trilead-ssh2 (from org.jenkins-ci)
- upgrade to support newer algorithms
* Update latest jar release
Co-authored-by: Abhishek Kumar <[email protected]>
Co-authored-by: Rohit Yadav <[email protected]>
---
pom.xml | 18 ++++++++++++++++--
test/pom.xml | 2 +-
utils/pom.xml | 3 ++-
utils/src/main/java/com/cloud/utils/ssh/SshHelper.java | 2 +-
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ac0bdd..f497032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,7 @@
<cs.servicemix.version>3.4.4_1</cs.servicemix.version>
<cs.servlet.version>4.0.1</cs.servlet.version>
<cs.tomcat-embed-core.version>8.5.61</cs.tomcat-embed-core.version>
- <cs.trilead.version>1.0.0-build222</cs.trilead.version>
+ <cs.trilead.version>build-217-jenkins-27</cs.trilead.version>
<cs.vmware.api.version>6.7</cs.vmware.api.version>
<cs.winrm4j.version>0.5.0</cs.winrm4j.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
@@ -334,7 +334,7 @@
<version>${cs.xstream.version}</version>
</dependency>
<dependency>
- <groupId>com.trilead</groupId>
+ <groupId>org.jenkins-ci</groupId>
<artifactId>trilead-ssh2</artifactId>
<version>${cs.trilead.version}</version>
</dependency>
@@ -739,6 +739,20 @@
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>repo.jenkins-ci.org.releases</id>
+ <url>http://repo.jenkins-ci.org/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>repo.jenkins-ci.org.public</id>
+ <url>http://repo.jenkins-ci.org/public/</url>
+ </repository>
+ </repositories>
+
<build>
<defaultGoal>install</defaultGoal>
<plugins>
diff --git a/test/pom.xml b/test/pom.xml
index 41112bf..735bcf2 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -37,7 +37,7 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>com.trilead</groupId>
+ <groupId>org.jenkins-ci</groupId>
<artifactId>trilead-ssh2</artifactId>
</dependency>
<dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 8612e8a..481631d 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -79,8 +79,9 @@
<artifactId>jasypt</artifactId>
</dependency>
<dependency>
- <groupId>com.trilead</groupId>
+ <groupId>org.jenkins-ci</groupId>
<artifactId>trilead-ssh2</artifactId>
+ <version>${cs.trilead.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
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 537ebe7..d5cd91af 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);
