This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 94d6b53 [KARAF-6878]Fix WARNING: package
org.apache.karaf.specs.locator not in java.base
94d6b53 is described below
commit 94d6b536624e0c83865ff8274cec753f826afad2
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Thu Mar 18 21:18:23 2021 -0400
[KARAF-6878]Fix WARNING: package org.apache.karaf.specs.locator not in
java.base
(cherry picked from commit 473586c163aa3e208fa8be96cd3393b9a6623d1c)
---
.../src/main/java/org/apache/karaf/itests/KarafTestSupport.java | 4 ++--
.../karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java | 4 ++--
2 files changed, 4 insertions(+), 4 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 898cc33..86a0a2b 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
@@ -251,7 +251,6 @@ public class KarafTestSupport {
KarafDistributionOption.editConfigurationFilePut("etc/branding.properties",
"welcome", ""), // No welcome banner
KarafDistributionOption.editConfigurationFilePut("etc/branding-ssh.properties",
"welcome", ""),
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") + ".jar"),
@@ -277,7 +276,8 @@ public class KarafTestSupport {
new
VMOption("--add-exports=java.base/sun.net.www.content.text=ALL-UNNAMED"),
new
VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
new VMOption("-classpath"),
- new VMOption("lib/jdk9plus/*" + File.pathSeparator +
"lib/boot/*")
+ new VMOption("lib/jdk9plus/*" + File.pathSeparator +
"lib/boot/*"
+ + File.pathSeparator + "lib/endorsed/*")
};
} else {
diff --git
a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
index d8bcedb..5fccfc5 100644
---
a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
+++
b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java
@@ -91,7 +91,6 @@ public abstract class KarafMinimalMonitoredTestSupport {
editConfigurationFilePut("etc/startup.properties",
"file:../../" + new File(url.toURI()).getName(), "1"),
composite(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", new
File("target/test-classes/etc/org.apache.karaf.features.cfg"))),
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") + ".jar"),
@@ -118,7 +117,8 @@ public abstract class KarafMinimalMonitoredTestSupport {
new
VMOption("--add-exports=java.base/sun.net.www.content.text=ALL-UNNAMED"),
new
VMOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
new VMOption("-classpath"),
- new VMOption("lib/jdk9plus/*" + File.pathSeparator +
"lib/boot/*")
+ new VMOption("lib/jdk9plus/*" + File.pathSeparator +
"lib/boot/*"
+ + File.pathSeparator + "lib/endorsed/*" )
};
} else {
return new Option[] {
