From 314128fb2a5dcaa300b32577c44a0c988be80291 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Mon, 13 May 2024 11:30:47 +0100
Subject: [PATCH] remove trilead dep, add optional dep to BC and eddsa

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
---
 mina-sshd-api-common/pom.xml | 11 +++++++++++
 mina-sshd-api-core/pom.xml   |  5 -----
 pom.xml                      | 21 ++++++++++++---------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/mina-sshd-api-common/pom.xml b/mina-sshd-api-common/pom.xml
index ee2aaaa..59401f8 100644
--- a/mina-sshd-api-common/pom.xml
+++ b/mina-sshd-api-common/pom.xml
@@ -36,5 +36,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>eddsa-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>bouncycastle-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/mina-sshd-api-core/pom.xml b/mina-sshd-api-core/pom.xml
index e91b356..ad04537 100644
--- a/mina-sshd-api-core/pom.xml
+++ b/mina-sshd-api-core/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index c33e4ee..b65cd71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 
@@ -76,11 +76,20 @@
         <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>
+                <!-- 
+                     TODO remove the eddsa-api management below when the bom upadte includes eddsa-api
+                     https://github.com/jenkinsci/bom/pull/3230
+                -->
+                <version>3041.ve87ce2cdf223</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.jenkins.plugins</groupId>
+                <artifactId>eddsa-api</artifactId>
+                <version>0.3.0-4.v84c6f0f4969e</version>
+            </dependency>
             <dependency>
                 <groupId>io.jenkins.plugins.mina-sshd-api</groupId>
                 <artifactId>mina-sshd-api-common</artifactId>
@@ -91,12 +100,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>