From 61964d2a498ecc35766bd2a75bbbb1b7962cebbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=BCger?= Date: Mon, 17 Dec 2018 13:57:26 +0100 Subject: [PATCH 2/2] Use correct version of endorsed libraries The Karaf version is known. Therefore we need to use it. --- .../java/org/apache/karaf/itests/KarafTestSupport.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java index b2e067223f..1e1294f9e2 100644 --- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java +++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java @@ -172,6 +172,7 @@ public class KarafTestSupport { @Configuration public Option[] config() { + String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf"); MavenArtifactUrlReference karafUrl = CoreOptions.maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"); String httpPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_HTTP_PORT), Integer.parseInt(MAX_HTTP_PORT))); String rmiRegistryPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_RMI_REG_PORT), Integer.parseInt(MAX_RMI_REG_PORT))); @@ -220,11 +221,10 @@ public class KarafTestSupport { new VMOption("--add-reads=java.xml=java.logging"), new VMOption("--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"), new VMOption("--patch-module"), - new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" - + System.getProperty("karaf.version", "4.2.2-SNAPSHOT") + ".jar"), - new VMOption("--patch-module"), - new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" - + System.getProperty("karaf.version", "4.2.2-SNAPSHOT") + ".jar"), + new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" + + System.getProperty("karaf.version", karafVersion) + ".jar"), + new VMOption("--patch-module"), new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" + + System.getProperty("karaf.version", karafVersion) + ".jar"), new VMOption("--add-opens"), new VMOption("java.base/java.security=ALL-UNNAMED"), new VMOption("--add-opens"), -- 2.19.1