This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push: new 257c738 [KARAF-6298]fix XATest|JmsExampleTest|RestExampleTest with JDK11 257c738 is described below commit 257c7381a75b2fe58e0d7d5d811d0822acc3c734 Author: Freeman Fang <freeman.f...@gmail.com> AuthorDate: Thu May 30 16:09:40 2019 -0400 [KARAF-6298]fix XATest|JmsExampleTest|RestExampleTest with JDK11 --- .../karaf-rest-example-features/src/main/feature/feature.xml | 2 ++ itests/test/src/test/java/org/apache/karaf/itests/XATest.java | 7 ------- .../test/java/org/apache/karaf/itests/examples/JmsExampleTest.java | 7 ------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml index 69dc099..bad7a67 100644 --- a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml +++ b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml @@ -54,6 +54,8 @@ <feature>http-whiteboard</feature> <feature>aries-jax-rs-whiteboard</feature> <feature>aries-jax-rs-whiteboard-jackson</feature> + <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-spec.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-spec.version}</bundle> <bundle>mvn:org.apache.karaf.examples/karaf-rest-example-whiteboard/${project.version}</bundle> </feature> diff --git a/itests/test/src/test/java/org/apache/karaf/itests/XATest.java b/itests/test/src/test/java/org/apache/karaf/itests/XATest.java index 1c14c55..026a473 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/XATest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/XATest.java @@ -22,7 +22,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil; import org.ops4j.pax.exam.MavenUtils; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @@ -64,12 +63,6 @@ public class XATest extends KarafTestSupport { result.add(replaceConfigurationFile("etc/org.ops4j.connectionfactory-artemis.cfg", getConfigFile("/org/apache/karaf/itests/features/org.ops4j.connectionfactory-artemis.cfg"))); result.add(replaceConfigurationFile("etc/org.ops4j.datasource-derby.cfg", getConfigFile("/org/apache/karaf/itests/features/org.ops4j.datasource-derby.cfg"))); result.add(replaceConfigurationFile("etc/xa-test-camel.xml", getConfigFile("/org/apache/karaf/itests/features/xa-test-camel.xml"))); - if (JavaVersionUtil.getMajorVersion() >= 9) { - //need asm 6.x which support java9plus to run this test - result.add(replaceConfigurationFile("system/org/apache/karaf/features/standard/" - + version + "/standard-" + version + "-features.xml", - getConfigFile("/etc/feature.xml"))); - } return result.toArray(new Option[result.size()]); } diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/JmsExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/JmsExampleTest.java index 38214ec..c4ca654 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/examples/JmsExampleTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/JmsExampleTest.java @@ -21,7 +21,6 @@ import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.MavenUtils; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -53,12 +52,6 @@ public class JmsExampleTest extends KarafTestSupport { result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "instance,package,log,ssh,framework,system,eventadmin,feature,shell,management,service,jaas,deployer,diagnostic,wrap,bundle,config,kar,aries-blueprint,artemis,jms,pax-jms-artemis")); result.add(replaceConfigurationFile("etc/org.ops4j.connectionfactory-artemis.cfg", getConfigFile("/org/apache/karaf/itests/features/org.ops4j.connectionfactory-artemis.cfg"))); - if (JavaVersionUtil.getMajorVersion() >= 9) { - //need asm 6.x which support java9plus to run this test - result.add(replaceConfigurationFile("system/org/apache/karaf/features/standard/" - + version + "/standard-" + version + "-features.xml", - getConfigFile("/etc/feature.xml"))); - } return result.toArray(new Option[result.size()]); }