Skip to content

Commit

Permalink
remove trilead dep, add optional dep to BC and eddsa
Browse files Browse the repository at this point in the history
Plugin depending on trilead (a different ssh implementaion)
makes no logical sense.

Add optional dependencies to bouncycasle and eddsa plugin.

The latter is needed for EdDSA keys, the former can add extra things
from BouncyCastle.

This prevents some classloading excpeptions where the context
classloader is set to a class that can see bouncycastle or eddsa code
yet the classloader of code in these plugin can not.

Now if eddsa or bouncycastle plugins are installed this plugin will
consistently be able to see the code.

remove management of ssh-credentials plugin
  • Loading branch information
jtnord committed May 17, 2024
1 parent 7060199 commit 3a48e20
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
12 changes: 12 additions & 0 deletions mina-sshd-api-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>eddsa-api</artifactId>
<version>0.3.0-4.v84c6f0f4969e</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>bouncycastle-api</artifactId>
<optional>true</optional>
</dependency>

</dependencies>
</project>
5 changes: 0 additions & 5 deletions mina-sshd-api-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,5 @@
<artifactId>ssh-credentials</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>trilead-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>
12 changes: 3 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<revision>2.12.1</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/mina-sshd-api-plugin</gitHubRepo>
<jenkins.version>2.387.3</jenkins.version>
<jenkins.version>2.426.3</jenkins.version>
<autoVersionSubmodules>true</autoVersionSubmodules>
</properties>

Expand Down Expand Up @@ -76,8 +76,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.387.x</artifactId>
<version>2543.vfb_1a_5fb_9496d</version>
<artifactId>bom-2.426.x</artifactId>
<version>3041.ve87ce2cdf223</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -91,12 +91,6 @@
<artifactId>mina-sshd-api-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<!-- we need a version which mark trilead-api as optional -->
<version>337.v395d2403ccd4</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

0 comments on commit 3a48e20

Please sign in to comment.