You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/08/26 08:08:53 UTC
[1/4] git commit: Fixed the mvn test error of camel-itest-karaf
Repository: camel
Updated Branches:
refs/heads/master b70c4189c -> 9863ac9e4
Fixed the mvn test error of camel-itest-karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9863ac9e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9863ac9e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9863ac9e
Branch: refs/heads/master
Commit: 9863ac9e42640bbc6448ab9763643093a7ffb4ee
Parents: e65f67e
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Aug 26 14:07:50 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Aug 26 14:08:13 2014 +0800
----------------------------------------------------------------------
tests/camel-itest-karaf/pom.xml | 2 -
.../camel/itest/karaf/AbstractFeatureTest.java | 77 +++++++++-----
.../camel/itest/karaf/org.ops4j.pax.url.mvn.cfg | 103 +++++++++++++++++++
3 files changed, 154 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9863ac9e/tests/camel-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 9e5e6b4..219ac8c 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -163,8 +163,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <argLine>-Xmx256m</argLine>
<systemPropertyVariables>
<karafVersion>${karaf-version}</karafVersion>
</systemPropertyVariables>
http://git-wip-us.apache.org/repos/asf/camel/blob/9863ac9e/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 9cd900c..c164b9a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -18,12 +18,15 @@ package org.apache.camel.itest.karaf;
import java.io.File;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
import javax.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultRouteContext;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.osgi.CamelContextFactory;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
import org.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.junit.After;
@@ -49,10 +52,14 @@ public abstract class AbstractFeatureTest {
@Before
public void setUp() throws Exception {
+ LOG.info("Calling the setUp method ");
+ LOG.info("The BundleContext is " + bundleContext);
+ Thread.sleep(3000);
}
@After
public void tearDown() throws Exception {
+ LOG.info("Calling the tearDown method ");
}
protected void testComponent(String component) throws Exception {
@@ -114,12 +121,19 @@ public abstract class AbstractFeatureTest {
}
protected CamelContext createCamelContext() throws Exception {
+ LOG.info("Creating the CamelContext ...");
+ setThreadContextClassLoader();
CamelContextFactory factory = new CamelContextFactory();
factory.setBundleContext(bundleContext);
LOG.info("Get the bundleContext is " + bundleContext);
return factory.createContext();
}
+ protected void setThreadContextClassLoader() {
+ // set the thread context classloader current bundle classloader
+ Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ }
+
public static String extractName(Class<?> clazz) {
String name = clazz.getName();
int id0 = name.indexOf("Camel") + "Camel".length();
@@ -139,7 +153,7 @@ public abstract class AbstractFeatureTest {
return mavenBundle().
groupId("org.apache.camel.karaf").
artifactId("apache-camel").
- classifier("features").type("xml").versionAsInProject();
+ versionAsInProject().type("xml/features");
}
public static UrlReference getKarafFeatureUrl() {
@@ -151,32 +165,43 @@ public abstract class AbstractFeatureTest {
artifactId("standard").version(karafVersion).type(type);
}
+ private static void switchPlatformEncodingToUTF8() {
+ try {
+ System.setProperty("file.encoding","UTF-8");
+ Field charset = Charset.class.getDeclaredField("defaultCharset");
+ charset.setAccessible(true);
+ charset.set(null,null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public static Option[] configure(String feature) {
- Option[] options =
- new Option[]{
- KarafDistributionOption.karafDistributionConfiguration().frameworkUrl(
- maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
- .karafVersion("2.3.6").name("Apache Karaf")
- .unpackDirectory(new File("target/paxexam/unpack/")),
-
- KarafDistributionOption.keepRuntimeFolder(),
- // override the config.properties (to fix pax-exam bug)
- KarafDistributionOption.replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
- KarafDistributionOption.replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
- KarafDistributionOption.replaceConfigurationFile("etc/jre.properties", new File("../../platforms/karaf/features/src/main/resources/config.properties")),
- // Add apache-snapshots repository
- KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",
- "http://repo1.maven.org/maven2@id=central, "
- + "http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, "
- + "http://repository.springsource.com/maven/bundles/release@id=springsource.release, "
- + "http://repository.springsource.com/maven/bundles/external@id=springsource.external, "
- + "http://oss.sonatype.org/content/repositories/releases/@id=sonatype, "
- + "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache"),
-
- // we need INFO logging otherwise we cannot see what happens
- KarafDistributionOption.logLevel(LogLevelOption.LogLevel.INFO),
- // install the cxf jaxb spec as the karaf doesn't provide it by default
- KarafDistributionOption.features(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-" + feature)};
+ switchPlatformEncodingToUTF8();
+
+ Option[] options =
+ new Option[]{
+ KarafDistributionOption.karafDistributionConfiguration()
+ .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
+ .karafVersion("2.3.6")
+ .name("Apache Karaf")
+ .useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
+
+ vmOption("-Dfile.encoding=UTF-8"),
+
+ KarafDistributionOption.keepRuntimeFolder(),
+ // override the config.properties (to fix pax-exam bug)
+ KarafDistributionOption.replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
+ KarafDistributionOption.replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
+ KarafDistributionOption.replaceConfigurationFile("etc/org.ops4j.pax.url.mvn.cfg", new File("src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg")),
+
+
+ // we need INFO logging otherwise we cannot see what happens
+ new LogLevelOption(LogLevelOption.LogLevel.INFO),
+
+
+ // install the cxf jaxb spec as the karaf doesn't provide it by default
+ KarafDistributionOption.features(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-" + feature)};
return options;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9863ac9e/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg b/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg
new file mode 100644
index 0000000..18fed15
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg
@@ -0,0 +1,103 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+#
+# If set to true, the following property will not allow any certificate to be used
+# when accessing Maven repositories through SSL
+#
+#org.ops4j.pax.url.mvn.certificateCheck=
+
+#
+# Path to the local Maven settings file.
+# The repositories defined in this file will be automatically added to the list
+# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
+# below is not set.
+# The following locations are checked for the existence of the settings.xml file
+# * 1. looks for the specified url
+# * 2. if not found looks for ${user.home}/.m2/settings.xml
+# * 3. if not found looks for ${maven.home}/conf/settings.xml
+# * 4. if not found looks for ${M2_HOME}/conf/settings.xml
+#
+#org.ops4j.pax.url.mvn.settings=
+
+#
+# Path to the local Maven repository which is used to avoid downloading
+# artifacts when they already exist locally.
+# The value of this property will be extracted from the settings.xml file
+# above, or defaulted to:
+# System.getProperty( "user.home" ) + "/.m2/repository"
+#
+#org.ops4j.pax.url.mvn.localRepository=
+
+#
+# Default this to false. It's just weird to use undocumented repos
+#
+org.ops4j.pax.url.mvn.useFallbackRepositories=false
+
+#
+# Uncomment if you don't wanna use the proxy settings
+# from the Maven conf/settings.xml file
+#
+# org.ops4j.pax.url.mvn.proxySupport=false
+
+#
+# Disable aether support by default. This ensure that the defaultRepositories
+# below will be used
+#
+org.ops4j.pax.url.mvn.disableAether=true
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# Those repositories will be checked before iterating through the
+# below list of repositories and even before the local repository
+# A repository url can be appended with zero or more of the following flags:
+# @snapshots : the repository contains snaphots
+# @noreleases : the repository does not contain any released artifacts
+# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
+#
+# The following property value will add the system folder as a repo.
+#
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository}
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# The default list includes the following repositories containing releases:
+# http://repo1.maven.org/maven2@id=central
+# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix
+# http://repository.springsource.com/maven/bundles/release@id=springsource.release
+# http://repository.springsource.com/maven/bundles/external@id=springsource.external
+# To add repositories to the default ones, prepend '+' to the list of repositories
+# to add.
+# A repository url can be appended with zero or more of the following flags:
+# @snapshots : the repository contains snapshots
+# @noreleases : the repository does not contain any released artifacts
+#
+# The default list doesn't contain any repository containing snapshots as it can impact the artifacts resolution.
+# You may want to add the following repositories containing snapshots:
+# http://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype.snapshot
+# http://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j.snapshot
+# http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache
+#
+org.ops4j.pax.url.mvn.repositories= \
+ http://repo1.maven.org/maven2@id=central, \
+ http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, \
+ http://repository.springsource.com/maven/bundles/release@id=springsource.release, \
+ http://repository.springsource.com/maven/bundles/external@id=springsource.external, \
+ http://oss.sonatype.org/content/repositories/releases/@id=sonatype
+
[3/4] Upgarded pax-exam version of camel-itest-karaf to 3.4.0
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
index 6794fd3..e70a0d5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJxpathTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJxpathTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
index d0e7587..0f6cf0f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelKafkaTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelKafkaTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
index 582b9c9..cd602fc 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelKratiTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelKratiTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
index a381e18..eea6c99 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelLdapTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelLdapTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
index f4a595a..44acd1b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelLuceneTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelLuceneTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
index 1dbb1ad..1487b0c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMailTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMailTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java
index 919d58f..0e6cf0c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMetricsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMetricsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
index 4f75f18..7e878b5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMina2Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMina2Test.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
index 9c7e006..ba996cd 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMinaTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMinaTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java
index 7b2400c..e3674e4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMongodbTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMongodbTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java
index a2c1148..e822cf4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMqttTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMqttTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
index 08dbecb..92016c5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
@@ -20,10 +20,10 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Fails for some unknown reason")
public class CamelMsvTest extends AbstractFeatureTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java
index 6358336..4895c47 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMustacheTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMustacheTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java
index 091bb0b..2aecdf7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMvelTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelMvelTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java
index 30fc90a..d0fbbff 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelMyBatisTest extends AbstractFeatureTest {
public static final String COMPONENT = "mybatis";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
index a18b792..ca01f74 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelNettyHttpTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelNettyHttpTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
index 69268c1..72426a7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelNettyTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelNettyTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java
index 233d6d5..9e29210 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelOgnlTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelOgnlTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
index e9f73eb..b24c6b1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelOpenshiftTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelOpenshiftTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
index 75dee2d..b916548 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelOptaplannerTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelOptaplannerTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java
index 1540386..98cb42d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelPrinterTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelPrinterTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java
index 1b789e9..164a457 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.ProtobufDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelProtobufTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelProtobufTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
index 386217c..58a4902 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelQuartz2Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelQuartz2Test.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java
index 0f5784e..a0ecfda 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelQuartzTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelQuartzTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java
index ed03100..62efdbd 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelQuickFixTest extends AbstractFeatureTest {
public static final String COMPONENT = "quickfix";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java
index 05cf916..32705e5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelRabbitmqTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelRabbitmqTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java
index 3d8cacd..3ebd795 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelRestletTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelRestletTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java
index c9f05f8..f0b79ac 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelRmiTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelRmiTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java
index 8d248f6..faca6d7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelRouteboxTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelRouteboxTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java
index bb2ae9c..6695e0b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelRssTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelRssTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java
index d2aa4b9..560cc5d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRubyTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelRubyTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelRubyTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java
index 41e993b..c022e0f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelRxTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelRxTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java
index 1bec87f..092fefa 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSalesforceTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSalesforceTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java
index cdeee15..c5a0a30 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSapNetweaverTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSapNetweaverTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java
index dedd49d..062b931 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSaxonTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSaxonTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java
index 7b9cc92..5a89c38 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelScalaTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelScalaTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
index 0dc69d8..f3effcf 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelScriptTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelScriptTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java
index 669030a..886b9a0 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelServletTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelServletTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java
index c77d612..bcc3a4b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSipTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSipTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java
index a0d371f..faf0487 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSjmsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSjmsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java
index e9c4bd4..6df9bce 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSmppTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSmppTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java
index 88eed6c..bd940bd 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSnmpTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSnmpTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java
index ff97060..bfc90ac 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSoapTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSoapTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java
index 9e9c9b4..613b3be 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSolrTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSolrTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java
index 8de10fb..d4f8e6a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSplunkTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSplunkTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
index 15ff0ac..7f59382 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSpringBatchTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSpringBatchTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
index e023b19..00cd150 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSpringIntegrationTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSpringIntegrationTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
index 7469c5a..6993312 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSpringJavaconfigTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSpringJavaconfigTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
index caea168..66f1251 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSpringLdapTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSpringLdapTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
index d3e6e2f..7e1f3ba 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSpringRedisTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSpringRedisTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
index 4609d3a..ba9f7ba 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSpringWebServiceTest extends AbstractFeatureTest {
public static final String COMPONENT = "spring-ws";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java
index 436844b..7e94f35 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSqlTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSqlTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java
index c8184de..00aee18 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSshTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSshTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java
index bf64af5..85b6f69 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelStAXTest extends AbstractFeatureTest {
public static final String COMPONENT = "stax";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java
index ff5093e..dea812d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelStompTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelStompTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java
index 3ad3c06..e99bc60 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelStreamTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelStreamTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java
index da60f9b..63032de 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelStringTemplateTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelStringTemplateTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
index 159e66a..cfca590 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.SyslogDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelSyslogTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelSyslogTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
index 60da744..7c38a9d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelTagsoupTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelTagsoupTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
index 7a8c50d..8034580 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelTestSpringTest extends AbstractFeatureTest {
public static final String COMPONENT = "test-spring";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java
index 4343a09..1a35c2c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelTestTest extends AbstractFeatureTest {
public static final String COMPONENT = "test";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
index 4d86905e..c141114 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelTwitterTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelTwitterTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
index d5a34f4..fb7d762 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelUrlrewriteTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelUrlrewriteTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java
index 85c08cd..fa476ec 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelVelocityTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelVelocityTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java
index f8081d4..5a32c15 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.junit.Assume.assumeTrue;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelVertxTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelVertxTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java
index 766a49f..9a4f40a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelWeatherTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelWeatherTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java
index 95faf33..a1cc8a0 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelWebsocketTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelWebsocketTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java
index c7a36b3..f68ae49 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelXmlbeansTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelXmlbeansTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java
index a7778d2..ea9644a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.XmlJsonDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelXmljsonTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelXmljsonTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
index 3a044ca..5ab16bb 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelXmlrpcTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelXmlrpcTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
index 21a6f26..7e39e1e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelXmlsecurityTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelXmlsecurityTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java
index 12208ca..07745ca 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelXmppTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelXmppTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
index a65ec4d..eca7a35 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
@@ -22,10 +22,10 @@ import org.apache.camel.model.dataformat.XStreamDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelXstreamTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelXstreamTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java
index 2ad0f298..5690859 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelYammerTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelYammerTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
index 3aa9511..5c7946e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelZipfileTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelZipfileTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java
index fa1ff05..9597efb 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelZookeeperTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelZookeeperTest.class);
[2/4] git commit: CAMEL-7615 Enabled the test of
CxfRsBlueprintRouterTest
Posted by ni...@apache.org.
CAMEL-7615 Enabled the test of CxfRsBlueprintRouterTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e65f67e3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e65f67e3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e65f67e3
Branch: refs/heads/master
Commit: e65f67e34905a01ffae7664d81f728d8a7bb9b4f
Parents: fe438ef
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Aug 26 14:05:57 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Aug 26 14:08:13 2014 +0800
----------------------------------------------------------------------
tests/camel-itest-osgi/pom.xml | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e65f67e3/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index ca89992..a6dc6c4 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -267,7 +267,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
+ <artifactId>spring-context-support</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -300,12 +300,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mail</artifactId>
+ <artifactId>camel-mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -375,19 +375,19 @@
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
+ <groupId>org.apache.cxf</goupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
@@ -486,7 +486,6 @@
<excludes>
<exclude>**/FIXMETest.*</exclude>
<exclude>**/FtpConsumeTest.*</exclude>
- <exclude>**/CxfRsBlueprintRouterTest.*</exclude>
<exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 -->
<exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 -->
</excludes>
@@ -494,7 +493,7 @@
<karafVersion>${karaf-version}</karafVersion>
</systemPropertyVariables>
</configuration>
- </plugin>
+ </plugin>
<!-- CXF wsdl2java generator, will plugin to the compile goal -->
<plugin>
@@ -549,7 +548,7 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>ci-build-profile</id>
[4/4] git commit: Upgarded pax-exam version of camel-itest-karaf to
3.4.0
Posted by ni...@apache.org.
Upgarded pax-exam version of camel-itest-karaf to 3.4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe438ef7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe438ef7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe438ef7
Branch: refs/heads/master
Commit: fe438ef79b601424b7bec444629662db79b94754
Parents: b70c418
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Aug 26 10:11:08 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Aug 26 14:08:13 2014 +0800
----------------------------------------------------------------------
tests/camel-itest-karaf/pom.xml | 12 +++++-----
.../camel/itest/karaf/AbstractFeatureTest.java | 25 +++++++++-----------
.../apache/camel/itest/karaf/CamelAhcTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelAmqpTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelApnsTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelAtomTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelAvroTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelAwsTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelBamTest.java | 6 ++---
.../camel/itest/karaf/CamelBase64Test.java | 6 ++---
.../itest/karaf/CamelBeanValidatorTest.java | 6 ++---
.../camel/itest/karaf/CamelBeanioTest.java | 6 ++---
.../camel/itest/karaf/CamelBindyTest.java | 6 ++---
.../camel/itest/karaf/CamelCacheTest.java | 6 ++---
.../camel/itest/karaf/CamelCastorTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelCmisTest.java | 6 ++---
.../camel/itest/karaf/CamelCometdTest.java | 6 ++---
.../camel/itest/karaf/CamelContextTest.java | 6 ++---
.../camel/itest/karaf/CamelCouchDBTest.java | 6 ++---
.../camel/itest/karaf/CamelCryptoTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelCsvTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelCxfTest.java | 6 ++---
.../camel/itest/karaf/CamelDisruptorTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelDnsTest.java | 6 ++---
.../camel/itest/karaf/CamelDropboxTest.java | 6 ++---
.../itest/karaf/CamelElasticsearchTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelExecTest.java | 6 ++---
.../camel/itest/karaf/CamelFacebookTest.java | 6 ++---
.../camel/itest/karaf/CamelFlatpackTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelFopTest.java | 6 ++---
.../camel/itest/karaf/CamelFreemarkerTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelFtpTest.java | 6 ++---
.../camel/itest/karaf/CamelGeocoderTest.java | 6 ++---
.../camel/itest/karaf/CamelGroovyTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelGsonTest.java | 6 ++---
.../itest/karaf/CamelGuavaEventBusTest.java | 6 ++---
.../camel/itest/karaf/CamelGuiceTest.java | 6 ++---
.../camel/itest/karaf/CamelHazelcastTest.java | 6 ++---
.../camel/itest/karaf/CamelHbaseTest.java | 6 ++---
.../camel/itest/karaf/CamelHdfs2Test.java | 6 ++---
.../apache/camel/itest/karaf/CamelHdfsTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelHl7Test.java | 6 ++---
.../camel/itest/karaf/CamelHttp4Test.java | 6 ++---
.../apache/camel/itest/karaf/CamelHttpTest.java | 6 ++---
.../camel/itest/karaf/CamelIbatisTest.java | 6 ++---
.../camel/itest/karaf/CamelInfinispanTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelIrcTest.java | 6 ++---
.../camel/itest/karaf/CamelJacksonTest.java | 6 ++---
.../camel/itest/karaf/CamelJasyptTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJaxbTest.java | 6 ++---
.../camel/itest/karaf/CamelJcloudsTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJcrTest.java | 6 ++---
.../itest/karaf/CamelJdbcAggregatorTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJdbcTest.java | 6 ++---
.../camel/itest/karaf/CamelJettyTest.java | 6 ++---
.../camel/itest/karaf/CamelJgroupsTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJibxTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJingTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJmsTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJmxTest.java | 6 ++---
.../camel/itest/karaf/CamelJosqlTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelJpaTest.java | 6 ++---
.../camel/itest/karaf/CamelJsonpathTest.java | 6 ++---
.../camel/itest/karaf/CamelJt400Test.java | 6 ++---
.../apache/camel/itest/karaf/CamelJuelTest.java | 6 ++---
.../camel/itest/karaf/CamelJxpathTest.java | 6 ++---
.../camel/itest/karaf/CamelKafkaTest.java | 6 ++---
.../camel/itest/karaf/CamelKratiTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelLdapTest.java | 6 ++---
.../camel/itest/karaf/CamelLuceneTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelMailTest.java | 6 ++---
.../camel/itest/karaf/CamelMetricsTest.java | 6 ++---
.../camel/itest/karaf/CamelMina2Test.java | 6 ++---
.../apache/camel/itest/karaf/CamelMinaTest.java | 6 ++---
.../camel/itest/karaf/CamelMongodbTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelMqttTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelMsvTest.java | 6 ++---
.../camel/itest/karaf/CamelMustacheTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelMvelTest.java | 6 ++---
.../camel/itest/karaf/CamelMyBatisTest.java | 6 ++---
.../camel/itest/karaf/CamelNettyHttpTest.java | 6 ++---
.../camel/itest/karaf/CamelNettyTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelOgnlTest.java | 6 ++---
.../camel/itest/karaf/CamelOpenshiftTest.java | 6 ++---
.../camel/itest/karaf/CamelOptaplannerTest.java | 6 ++---
.../camel/itest/karaf/CamelPrinterTest.java | 6 ++---
.../camel/itest/karaf/CamelProtobufTest.java | 6 ++---
.../camel/itest/karaf/CamelQuartz2Test.java | 6 ++---
.../camel/itest/karaf/CamelQuartzTest.java | 6 ++---
.../camel/itest/karaf/CamelQuickFixTest.java | 6 ++---
.../camel/itest/karaf/CamelRabbitmqTest.java | 6 ++---
.../camel/itest/karaf/CamelRestletTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelRmiTest.java | 6 ++---
.../camel/itest/karaf/CamelRouteboxTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelRssTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelRubyTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelRxTest.java | 6 ++---
.../camel/itest/karaf/CamelSalesforceTest.java | 6 ++---
.../itest/karaf/CamelSapNetweaverTest.java | 6 ++---
.../camel/itest/karaf/CamelSaxonTest.java | 6 ++---
.../camel/itest/karaf/CamelScalaTest.java | 6 ++---
.../camel/itest/karaf/CamelScriptTest.java | 6 ++---
.../camel/itest/karaf/CamelServletTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSipTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSjmsTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSmppTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSnmpTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSoapTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSolrTest.java | 6 ++---
.../camel/itest/karaf/CamelSplunkTest.java | 6 ++---
.../camel/itest/karaf/CamelSpringBatchTest.java | 6 ++---
.../itest/karaf/CamelSpringIntegrationTest.java | 6 ++---
.../itest/karaf/CamelSpringJavaconfigTest.java | 6 ++---
.../camel/itest/karaf/CamelSpringLdapTest.java | 6 ++---
.../camel/itest/karaf/CamelSpringRedisTest.java | 6 ++---
.../itest/karaf/CamelSpringWebServiceTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSqlTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelSshTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelStAXTest.java | 6 ++---
.../camel/itest/karaf/CamelStompTest.java | 6 ++---
.../camel/itest/karaf/CamelStreamTest.java | 6 ++---
.../itest/karaf/CamelStringTemplateTest.java | 6 ++---
.../camel/itest/karaf/CamelSyslogTest.java | 6 ++---
.../camel/itest/karaf/CamelTagsoupTest.java | 6 ++---
.../camel/itest/karaf/CamelTestSpringTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelTestTest.java | 6 ++---
.../camel/itest/karaf/CamelTwitterTest.java | 6 ++---
.../camel/itest/karaf/CamelUrlrewriteTest.java | 6 ++---
.../camel/itest/karaf/CamelVelocityTest.java | 6 ++---
.../camel/itest/karaf/CamelVertxTest.java | 6 ++---
.../camel/itest/karaf/CamelWeatherTest.java | 6 ++---
.../camel/itest/karaf/CamelWebsocketTest.java | 6 ++---
.../camel/itest/karaf/CamelXmlbeansTest.java | 6 ++---
.../camel/itest/karaf/CamelXmljsonTest.java | 6 ++---
.../camel/itest/karaf/CamelXmlrpcTest.java | 6 ++---
.../camel/itest/karaf/CamelXmlsecurityTest.java | 6 ++---
.../apache/camel/itest/karaf/CamelXmppTest.java | 6 ++---
.../camel/itest/karaf/CamelXstreamTest.java | 6 ++---
.../camel/itest/karaf/CamelYammerTest.java | 6 ++---
.../camel/itest/karaf/CamelZipfileTest.java | 6 ++---
.../camel/itest/karaf/CamelZookeeperTest.java | 6 ++---
141 files changed, 434 insertions(+), 437 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 50f9264..9e5e6b4 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -37,18 +37,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner-no-jcl</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.tooling.exam</groupId>
- <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index dfcd42f..9cd900c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultRouteContext;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.osgi.CamelContextFactory;
-import org.apache.karaf.tooling.exam.options.KarafDistributionOption;
-import org.apache.karaf.tooling.exam.options.LogLevelOption;
+import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.junit.After;
import org.junit.Before;
import org.ops4j.pax.exam.Option;
@@ -34,14 +34,11 @@ import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.replaceConfigurationFile;
+
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
+
public abstract class AbstractFeatureTest {
@@ -157,18 +154,18 @@ public abstract class AbstractFeatureTest {
public static Option[] configure(String feature) {
Option[] options =
new Option[]{
- karafDistributionConfiguration().frameworkUrl(
+ KarafDistributionOption.karafDistributionConfiguration().frameworkUrl(
maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
.karafVersion("2.3.6").name("Apache Karaf")
.unpackDirectory(new File("target/paxexam/unpack/")),
KarafDistributionOption.keepRuntimeFolder(),
// override the config.properties (to fix pax-exam bug)
- replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
- replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
- replaceConfigurationFile("etc/jre.properties", new File("../../platforms/karaf/features/src/main/resources/config.properties")),
+ KarafDistributionOption.replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
+ KarafDistributionOption.replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
+ KarafDistributionOption.replaceConfigurationFile("etc/jre.properties", new File("../../platforms/karaf/features/src/main/resources/config.properties")),
// Add apache-snapshots repository
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",
+ KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",
"http://repo1.maven.org/maven2@id=central, "
+ "http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, "
+ "http://repository.springsource.com/maven/bundles/release@id=springsource.release, "
@@ -177,9 +174,9 @@ public abstract class AbstractFeatureTest {
+ "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache"),
// we need INFO logging otherwise we cannot see what happens
- logLevel(LogLevelOption.LogLevel.INFO),
+ KarafDistributionOption.logLevel(LogLevelOption.LogLevel.INFO),
// install the cxf jaxb spec as the karaf doesn't provide it by default
- scanFeatures(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-" + feature)};
+ KarafDistributionOption.features(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-" + feature)};
return options;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
index 0ec1270..90abb6d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelAhcTest extends AbstractFeatureTest {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
index 843cb5a..3c99fba 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelAmqpTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelAmqpTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
index ec7daf2..d931eda 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelApnsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelApnsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
index ba2eb6f..a7ca26c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelAtomTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelAtomTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
index 5ad10f9..f96902a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.AvroDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelAvroTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelAvroTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
index 7bda30c..133cbb4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelAwsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelAwsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
index 8fa478a..b5514e5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBamTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBamTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
index e4b7f13..50aef64 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.Base64DataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBase64Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBase64Test.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
index 36cda26..645c6f4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBeanValidatorTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBeanValidatorTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
index beff805..0566d06 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.BeanioDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBeanioTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBeanioTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
index fc0f4f1..f9f6dc4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.BindyDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBindyTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBindyTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
index 275626f..1793dca 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCacheTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCacheTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
index b72c602..0ae0d16 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.CastorDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCastorTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCastorTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
index b4780d9..0fd4aa8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
@@ -19,11 +19,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCmisTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCxfTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
index f51ab5b..cbccfa1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCometdTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCometdTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
index eb3a810..1107402 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelContextTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelContextTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
index f019e3f..d280f18 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCouchDBTest extends AbstractFeatureTest {
public static final String COMPONENT = "couchdb";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
index 9cd5c68..712de11 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.CryptoDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCryptoTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCryptoTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
index c0159f9..3abfdbd 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.CsvDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCsvTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCsvTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
index 9d280f6..f0607bf 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelCxfTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCxfTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
index 5b56939..100eb0e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelDisruptorTest extends AbstractFeatureTest {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
index baddf02..9018950 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelDnsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelDnsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
index 36d7b49..39750c5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelDropboxTest extends AbstractFeatureTest {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
index a21e040..d60c802 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelElasticsearchTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelElasticsearchTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
index 5327163..88c7318 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelExecTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelExecTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
index 1de7f50..e90341d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelFacebookTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelFacebookTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
index 199e3f2..f207a57 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelFlatpackTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelFlatpackTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
index 12af049..27c7f8e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelFopTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelFopTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
index 00f0bee..d916289 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelFreemarkerTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelFreemarkerTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
index 9f9444f..e035cda 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelFtpTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelFtpTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
index 6f3382a..6a934aa 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelGeocoderTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelGeocoderTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
index 8faa0b4..95ab0fe 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelGroovyTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelGroovyTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
index 21f8c65..1020093 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
@@ -22,10 +22,10 @@ import org.apache.camel.model.dataformat.JsonLibrary;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelGsonTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelGsonTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
index 530bd0d..2088615 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelGuavaEventBusTest extends AbstractFeatureTest {
public static final String COMPONENT = "guava-eventbus";
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
index 97e081e..7b1ef55 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelGuiceTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelGuiceTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
index b563aaa..6af04a1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelHazelcastTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHazelcastTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
index 55ebc51..cf5f84f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelHbaseTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHbaseTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
index ac50076..cf94d2e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelHdfs2Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHdfs2Test.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
index cdfc38b..d7d085a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelHdfsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHdfsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
index f8130e5..0f39f31 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.HL7DataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelHl7Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHl7Test.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
index 2e0b5ba..817512d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelHttp4Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHttp4Test.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
index d2c6259..ac1af2b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelHttpTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHttpTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
index f5ab3d6..9071453 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelIbatisTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelIbatisTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
index d11c400..cd253fd 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelInfinispanTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelInfinispanTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
index 207f31f..f007a6f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelIrcTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelIrcTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java
index 8468598..74b427a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java
@@ -22,10 +22,10 @@ import org.apache.camel.model.dataformat.JsonLibrary;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJacksonTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJacksonTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
index 7f71df8..216aed8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJasyptTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJasyptTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
index 81c59ac..de2b09a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJaxbTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJaxbTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java
index 2b499e9..2147b5c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJcloudsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJcloudsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java
index fbc33f4..46ebc2a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJcrTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJcrTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java
index 665da5c..3e70072 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJdbcAggregatorTest extends AbstractFeatureTest {
// the aggregator is included in the camel-sql artifact
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java
index d0ab87e..ee4a37f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJdbcTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJdbcTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java
index 32d58c7..768d606 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJettyTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJettyTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java
index c5a8a64..6a5988b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJgroupsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJgroupsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
index 54b4e7e..ab4b8e8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.JibxDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJibxTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJibxTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java
index d76fd76..d1101ba 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJingTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJingTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java
index e69fbc7..561b094 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJmsTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJmsTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java
index bc83cf8..833056d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJmxTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJmxTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java
index 9c464c4..c9fecdf 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJosqlTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJosqlTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
index 11de1fa..ad0a56c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJpaTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJpaTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java
index a86cdde..c03ee73 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJsonpathTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJsonpathTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java
index 3a51913..fa1d51e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJt400Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJt400Test.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java
index 7bede1c..96d2f1b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelJuelTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJuelTest.class);