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

NO-JIRA Fixing java.security location on java11

This commit is contained in:
Clebert Suconic 2020-08-20 11:35:13 -04:00
parent 316618e845
commit a2bf85f529
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/dnsswitch/DNSSwitchTest.java
View File

@ -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));