You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/03/31 14:22:52 UTC
[activemq-artemis] branch master updated: NO-JIRA Fix
SSLSupportTest for IBM JVM
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new a70b21c NO-JIRA Fix SSLSupportTest for IBM JVM
new d895f38 This closes #3523
a70b21c is described below
commit a70b21cf8906dd23e0efea41bea913f9fb917ba3
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Wed Mar 31 15:46:19 2021 +0200
NO-JIRA Fix SSLSupportTest for IBM JVM
---
.../unit/core/remoting/impl/ssl/SSLSupportTest.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
index 663139a..7539b55 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
@@ -35,12 +35,19 @@ public class SSLSupportTest extends ActiveMQTestBase {
@Parameterized.Parameters(name = "storeProvider={0}, storeType={1}")
public static Collection getParameters() {
- return Arrays.asList(new Object[][]{
- {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE},
- {"SunJCE", "JCEKS"},
- {"SUN", "JKS"},
- {"SunJSSE", "PKCS12"}
- });
+ if (System.getProperty("java.vendor").contains("IBM")) {
+ return Arrays.asList(new Object[][]{
+ {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE},
+ {"IBMJCE", "JCEKS"}
+ });
+ } else {
+ return Arrays.asList(new Object[][]{
+ {TransportConstants.DEFAULT_KEYSTORE_PROVIDER, TransportConstants.DEFAULT_KEYSTORE_TYPE},
+ {"SunJCE", "JCEKS"},
+ {"SUN", "JKS"},
+ {"SunJSSE", "PKCS12"}
+ });
+ }
}
public SSLSupportTest(String storeProvider, String storeType) {