etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <abhishek.mrt22@gmail.com>
Co-authored-by: Rohit Yadav <rohit@apache.org>
This commit is contained in:
Miklos Barabas 2021-04-07 07:54:07 +02:00 committed by GitHub
parent be781804f1
commit 7208fac18b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -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>

2
test/pom.xml
View File

@ -37,7 +37,7 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>com.trilead</groupId>
<groupId>org.jenkins-ci</groupId>
<artifactId>trilead-ssh2</artifactId>
</dependency>
<dependency>

3
utils/pom.xml
View File

@ -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>

2
utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
View File

@ -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);