From a147d8ab56d4e5dfe7a9729172699e731ef0dcd0 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 3 Jul 2025 18:23:30 +1000
Subject: [PATCH] Remove net.i2p.crypto:eddsa which is not supported anymore
 and use support of EdDSA natively provided now by Apache Mina via
 Bouncycastle (#10788)

* Remove net.i2p.crypto:eddsa which is not supported anymore and use support of EdDSA natively provided now by Apache Mina via Bouncycastle

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 cli/pom.xml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index cf30714cac..2096ead4ad 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -43,13 +43,6 @@
       <artifactId>commons-lang</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <!-- ed25519 algorithm, see JENKINS-45318 -->
-      <groupId>net.i2p.crypto</groupId>
-      <artifactId>eddsa</artifactId>
-      <version>0.3.0</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-common</artifactId>
@@ -62,6 +55,12 @@
       <version>${mina-sshd.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <version>1.81</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.tyrus.bundles</groupId>
       <artifactId>tyrus-standalone-client-jdk</artifactId>
@@ -119,7 +118,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.0</version>
         <executions>
           <execution>
             <goals>
@@ -155,6 +153,17 @@
                 </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
               </transformers>
+              <filters>
+                <filter>
+                  <!-- signature might cause some trouble -->
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>