Skip to content

Commit 7208fac

Browse files
miklosbarabasshwstppryadvr
authored
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>
1 parent be78180 commit 7208fac

4 files changed

Lines changed: 20 additions & 5 deletions

File tree

pom.xml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<cs.servicemix.version>3.4.4_1</cs.servicemix.version>
166166
<cs.servlet.version>4.0.1</cs.servlet.version>
167167
<cs.tomcat-embed-core.version>8.5.61</cs.tomcat-embed-core.version>
168-
<cs.trilead.version>1.0.0-build222</cs.trilead.version>
168+
<cs.trilead.version>build-217-jenkins-27</cs.trilead.version>
169169
<cs.vmware.api.version>6.7</cs.vmware.api.version>
170170
<cs.winrm4j.version>0.5.0</cs.winrm4j.version>
171171
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
@@ -334,7 +334,7 @@
334334
<version>${cs.xstream.version}</version>
335335
</dependency>
336336
<dependency>
337-
<groupId>com.trilead</groupId>
337+
<groupId>org.jenkins-ci</groupId>
338338
<artifactId>trilead-ssh2</artifactId>
339339
<version>${cs.trilead.version}</version>
340340
</dependency>
@@ -739,6 +739,20 @@
739739
</dependency>
740740
</dependencies>
741741

742+
<repositories>
743+
<repository>
744+
<id>repo.jenkins-ci.org.releases</id>
745+
<url>http://repo.jenkins-ci.org/releases/</url>
746+
<snapshots>
747+
<enabled>false</enabled>
748+
</snapshots>
749+
</repository>
750+
<repository>
751+
<id>repo.jenkins-ci.org.public</id>
752+
<url>http://repo.jenkins-ci.org/public/</url>
753+
</repository>
754+
</repositories>
755+
742756
<build>
743757
<defaultGoal>install</defaultGoal>
744758
<plugins>

test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<artifactId>log4j</artifactId>
3838
</dependency>
3939
<dependency>
40-
<groupId>com.trilead</groupId>
40+
<groupId>org.jenkins-ci</groupId>
4141
<artifactId>trilead-ssh2</artifactId>
4242
</dependency>
4343
<dependency>

utils/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@
7979
<artifactId>jasypt</artifactId>
8080
</dependency>
8181
<dependency>
82-
<groupId>com.trilead</groupId>
82+
<groupId>org.jenkins-ci</groupId>
8383
<artifactId>trilead-ssh2</artifactId>
84+
<version>${cs.trilead.version}</version>
8485
</dependency>
8586
<dependency>
8687
<groupId>com.amazonaws</groupId>

utils/src/main/java/com/cloud/utils/ssh/SshHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ protected static Session openConnectionSession(Connection conn) throws IOExcepti
260260
* does not have an exit status, it returns true to break the loop; otherwise, it returns
261261
* false.
262262
*/
263-
protected static boolean canEndTheSshConnection(int waitResultTimeoutInMs, com.trilead.ssh2.Session sess, int conditions) throws SshException {
263+
protected static boolean canEndTheSshConnection(int waitResultTimeoutInMs, com.trilead.ssh2.Session sess, int conditions) throws SshException, InterruptedException {
264264
if (isChannelConditionEof(conditions)) {
265265
int newConditions = sess.waitForCondition(ChannelCondition.EXIT_STATUS, waitResultTimeoutInMs);
266266
throwSshExceptionIfConditionsTimeout(newConditions);

0 commit comments

Comments
 (0)