Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-4710 Keep pem-keystore dependencies as is; make it really 

optional

The latest version already uses bcprov-jdk18on.
Avoid global imports to be able to exclude dependency when not used.
This commit is contained in:
Alexey Markevich 2024-04-02 10:34:59 +02:00 committed by Robbie Gemmell
parent f36e944641
commit bf1ea41287
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artemis-core-client/pom.xml
View File

@ -124,15 +124,6 @@
<groupId>de.dentrassi.crypto</groupId> <groupId>de.dentrassi.crypto</groupId>
<artifactId>pem-keystore</artifactId> <artifactId>pem-keystore</artifactId>
</dependency> </dependency>
<!-- bcprov-jdk18on replaces bcprov-jdk15on excluded pem-keystore -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<!-- The johnzon-core and json-api contents are repackaged in -commons, <!-- The johnzon-core and json-api contents are repackaged in -commons,
However maven can still need them during tests, which run against However maven can still need them during tests, which run against

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
View File

@ -47,7 +47,6 @@ import java.security.cert.X509CertSelector;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.Collection; import java.util.Collection;
import de.dentrassi.crypto.pem.PemKeyStoreProvider;
import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider; import io.netty.handler.ssl.SslProvider;
@ -356,7 +355,8 @@ public class SSLSupport {
public static void checkPemProviderLoaded(String keystoreType) { public static void checkPemProviderLoaded(String keystoreType) {
if (keystoreType != null && keystoreType.startsWith("PEM")) { if (keystoreType != null && keystoreType.startsWith("PEM")) {
if (Security.getProvider("PEM") == null) { if (Security.getProvider("PEM") == null) {
Security.insertProviderAt(new PemKeyStoreProvider(), Integer.parseInt(System.getProperty("artemis.pemProvider.insertAt", "0"))); Security.insertProviderAt(new de.dentrassi.crypto.pem.PemKeyStoreProvider(),
Integer.parseInt(System.getProperty("artemis.pemProvider.insertAt", "0")));
} }
} }
} }

11
artemis-pom/pom.xml
View File

@ -162,17 +162,6 @@
<artifactId>pem-keystore</artifactId> <artifactId>pem-keystore</artifactId>
<version>${pem-keystore.version}</version> <version>${pem-keystore.version}</version>
<!-- Eclipse Public License - v 1.0 --> <!-- Eclipse Public License - v 1.0 -->
<exclusions>
<!-- exclude bcprov-jdk15on to avoid conflicts with bcprov-jdk18on -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>