Skip to content

Commit a147d8a

Browse files
authored
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>
1 parent ed44d76 commit a147d8a

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

cli/pom.xml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@
4343
<artifactId>commons-lang</artifactId>
4444
<optional>true</optional>
4545
</dependency>
46-
<dependency>
47-
<!-- ed25519 algorithm, see JENKINS-45318 -->
48-
<groupId>net.i2p.crypto</groupId>
49-
<artifactId>eddsa</artifactId>
50-
<version>0.3.0</version>
51-
<optional>true</optional>
52-
</dependency>
5346
<dependency>
5447
<groupId>org.apache.sshd</groupId>
5548
<artifactId>sshd-common</artifactId>
@@ -62,6 +55,12 @@
6255
<version>${mina-sshd.version}</version>
6356
<optional>true</optional>
6457
</dependency>
58+
<dependency>
59+
<groupId>org.bouncycastle</groupId>
60+
<artifactId>bcprov-jdk18on</artifactId>
61+
<version>1.81</version>
62+
<optional>true</optional>
63+
</dependency>
6564
<dependency>
6665
<groupId>org.glassfish.tyrus.bundles</groupId>
6766
<artifactId>tyrus-standalone-client-jdk</artifactId>
@@ -119,7 +118,6 @@
119118
<plugin>
120119
<groupId>org.apache.maven.plugins</groupId>
121120
<artifactId>maven-shade-plugin</artifactId>
122-
<version>3.6.0</version>
123121
<executions>
124122
<execution>
125123
<goals>
@@ -155,6 +153,17 @@
155153
</transformer>
156154
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
157155
</transformers>
156+
<filters>
157+
<filter>
158+
<!-- signature might cause some trouble -->
159+
<artifact>*:*</artifact>
160+
<excludes>
161+
<exclude>META-INF/*.SF</exclude>
162+
<exclude>META-INF/*.DSA</exclude>
163+
<exclude>META-INF/*.RSA</exclude>
164+
</excludes>
165+
</filter>
166+
</filters>
158167
</configuration>
159168
</execution>
160169
</executions>

0 commit comments

Comments
 (0)