You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/31 05:33:14 UTC
[camel] branch master updated: CAMEL-14341: Simple add jdk9plus
classpath to make test pass. (#3454)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 358e607 CAMEL-14341: Simple add jdk9plus classpath to make test pass. (#3454)
358e607 is described below
commit 358e6071de686826a43c157b7323ee3b435f54b1
Author: Bob Paulin <bo...@bobpaulin.com>
AuthorDate: Mon Dec 30 23:32:52 2019 -0600
CAMEL-14341: Simple add jdk9plus classpath to make test pass. (#3454)
---
.../apache/camel/component/osgi/activator/PaxExamOptions.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
index d462c0e..7940d78 100644
--- a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
+++ b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
@@ -23,12 +23,15 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil;
import org.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.ops4j.pax.exam.options.DefaultCompositeOption;
+import org.ops4j.pax.exam.options.extra.VMOption;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.streamBundle;
+import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
@@ -51,7 +54,12 @@ public enum PaxExamOptions {
// Don't bother with local console output as it just ends up cluttering the logs
configureConsole().ignoreLocalConsole(),
// Force the log level to INFO so we have more details during the test. It defaults to WARN.
- logLevel(LogLevelOption.LogLevel.INFO)
+ logLevel(LogLevelOption.LogLevel.INFO),
+ when(JavaVersionUtil.getMajorVersion() >= 9)
+ .useOptions(
+ new VMOption("-classpath"),
+ new VMOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*")
+ )
),
CAMEL_CORE_OSGI(
createStreamBundleOption("camel-core-engine.jar"),