From a2bf85f5290ccccce40e6d818814c5e1944a2846 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Thu, 20 Aug 2020 11:35:13 -0400 Subject: [PATCH] NO-JIRA Fixing java.security location on java11 --- .../artemis/tests/smoke/dnsswitch/DNSSwitchTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/dnsswitch/DNSSwitchTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/dnsswitch/DNSSwitchTest.java index e426dbaa36..39999ce2a4 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/dnsswitch/DNSSwitchTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/dnsswitch/DNSSwitchTest.java @@ -218,7 +218,17 @@ public class DNSSwitchTest extends SmokeTestBase { Assert.assertTrue("You must send pairs as overrideParameters", overrideParameters.length % 2 == 0); - File security = new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "security" + File.separator + "java.security"); + + String javaVersion = System.getProperty("java.version"); + + File security; + + if (javaVersion.startsWith("1.8")) { + security = new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "security" + File.separator + "java.security"); + } else { + security = new File(System.getProperty("java.home") + File.separator + "conf" + File.separator + "security" + File.separator + "java.security"); + } + Properties securityProperties = new Properties(); securityProperties.load(new FileInputStream(security));