You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2014/08/27 16:30:48 UTC
[2/2] git commit: Fix all the checkstyle errors in camel-itest-karaf
as a result of the pax-exam update
Fix all the checkstyle errors in camel-itest-karaf as a result of the pax-exam update
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cfa10145
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cfa10145
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cfa10145
Branch: refs/heads/master
Commit: cfa1014535eecbc1100c657ea5a672c67ad1c530
Parents: 45f0752
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Aug 27 10:30:13 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 27 10:30:13 2014 -0400
----------------------------------------------------------------------
.../camel/itest/karaf/AbstractFeatureTest.java | 46 ++++++++++----------
.../apache/camel/itest/karaf/CamelAhcTest.java | 2 +-
.../apache/camel/itest/karaf/CamelAmqpTest.java | 2 +-
.../apache/camel/itest/karaf/CamelApnsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelAtomTest.java | 2 +-
.../apache/camel/itest/karaf/CamelAvroTest.java | 2 +-
.../apache/camel/itest/karaf/CamelAwsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelBamTest.java | 2 +-
.../camel/itest/karaf/CamelBase64Test.java | 2 +-
.../itest/karaf/CamelBeanValidatorTest.java | 2 +-
.../camel/itest/karaf/CamelBeanioTest.java | 2 +-
.../camel/itest/karaf/CamelBindyTest.java | 2 +-
.../camel/itest/karaf/CamelCacheTest.java | 2 +-
.../camel/itest/karaf/CamelCastorTest.java | 2 +-
.../apache/camel/itest/karaf/CamelCmisTest.java | 2 +-
.../camel/itest/karaf/CamelCometdTest.java | 2 +-
.../camel/itest/karaf/CamelContextTest.java | 2 +-
.../camel/itest/karaf/CamelCouchDBTest.java | 2 +-
.../camel/itest/karaf/CamelCryptoTest.java | 2 +-
.../apache/camel/itest/karaf/CamelCsvTest.java | 2 +-
.../apache/camel/itest/karaf/CamelCxfTest.java | 2 +-
.../camel/itest/karaf/CamelDisruptorTest.java | 2 +-
.../apache/camel/itest/karaf/CamelDnsTest.java | 2 +-
.../camel/itest/karaf/CamelDropboxTest.java | 2 +-
.../itest/karaf/CamelElasticsearchTest.java | 2 +-
.../apache/camel/itest/karaf/CamelExecTest.java | 2 +-
.../camel/itest/karaf/CamelFacebookTest.java | 2 +-
.../camel/itest/karaf/CamelFlatpackTest.java | 2 +-
.../apache/camel/itest/karaf/CamelFopTest.java | 2 +-
.../camel/itest/karaf/CamelFreemarkerTest.java | 2 +-
.../apache/camel/itest/karaf/CamelFtpTest.java | 2 +-
.../camel/itest/karaf/CamelGeocoderTest.java | 2 +-
.../camel/itest/karaf/CamelGroovyTest.java | 2 +-
.../apache/camel/itest/karaf/CamelGsonTest.java | 2 +-
.../itest/karaf/CamelGuavaEventBusTest.java | 2 +-
.../camel/itest/karaf/CamelGuiceTest.java | 2 +-
.../camel/itest/karaf/CamelHazelcastTest.java | 2 +-
.../camel/itest/karaf/CamelHbaseTest.java | 2 +-
.../camel/itest/karaf/CamelHdfs2Test.java | 2 +-
.../apache/camel/itest/karaf/CamelHdfsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelHl7Test.java | 2 +-
.../camel/itest/karaf/CamelHttp4Test.java | 2 +-
.../apache/camel/itest/karaf/CamelHttpTest.java | 2 +-
.../camel/itest/karaf/CamelIbatisTest.java | 2 +-
.../camel/itest/karaf/CamelInfinispanTest.java | 2 +-
.../apache/camel/itest/karaf/CamelIrcTest.java | 2 +-
.../camel/itest/karaf/CamelJacksonTest.java | 2 +-
.../camel/itest/karaf/CamelJasyptTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJaxbTest.java | 2 +-
.../camel/itest/karaf/CamelJcloudsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJcrTest.java | 2 +-
.../itest/karaf/CamelJdbcAggregatorTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJdbcTest.java | 2 +-
.../camel/itest/karaf/CamelJettyTest.java | 2 +-
.../camel/itest/karaf/CamelJgroupsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJibxTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJingTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJmsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJmxTest.java | 2 +-
.../camel/itest/karaf/CamelJosqlTest.java | 2 +-
.../apache/camel/itest/karaf/CamelJpaTest.java | 2 +-
.../camel/itest/karaf/CamelJsonpathTest.java | 2 +-
.../camel/itest/karaf/CamelJt400Test.java | 2 +-
.../apache/camel/itest/karaf/CamelJuelTest.java | 2 +-
.../camel/itest/karaf/CamelJxpathTest.java | 2 +-
.../camel/itest/karaf/CamelKafkaTest.java | 2 +-
.../camel/itest/karaf/CamelKratiTest.java | 2 +-
.../apache/camel/itest/karaf/CamelLdapTest.java | 2 +-
.../camel/itest/karaf/CamelLuceneTest.java | 2 +-
.../apache/camel/itest/karaf/CamelMailTest.java | 2 +-
.../camel/itest/karaf/CamelMetricsTest.java | 2 +-
.../camel/itest/karaf/CamelMina2Test.java | 2 +-
.../apache/camel/itest/karaf/CamelMinaTest.java | 2 +-
.../camel/itest/karaf/CamelMongodbTest.java | 2 +-
.../apache/camel/itest/karaf/CamelMqttTest.java | 2 +-
.../apache/camel/itest/karaf/CamelMsvTest.java | 2 +-
.../camel/itest/karaf/CamelMustacheTest.java | 2 +-
.../apache/camel/itest/karaf/CamelMvelTest.java | 2 +-
.../camel/itest/karaf/CamelMyBatisTest.java | 2 +-
.../camel/itest/karaf/CamelNettyHttpTest.java | 2 +-
.../camel/itest/karaf/CamelNettyTest.java | 2 +-
.../apache/camel/itest/karaf/CamelOgnlTest.java | 2 +-
.../camel/itest/karaf/CamelOpenshiftTest.java | 2 +-
.../camel/itest/karaf/CamelOptaplannerTest.java | 2 +-
.../camel/itest/karaf/CamelPrinterTest.java | 2 +-
.../camel/itest/karaf/CamelProtobufTest.java | 2 +-
.../camel/itest/karaf/CamelQuartz2Test.java | 2 +-
.../camel/itest/karaf/CamelQuartzTest.java | 2 +-
.../camel/itest/karaf/CamelQuickFixTest.java | 2 +-
.../camel/itest/karaf/CamelRabbitmqTest.java | 2 +-
.../camel/itest/karaf/CamelRestletTest.java | 2 +-
.../apache/camel/itest/karaf/CamelRmiTest.java | 2 +-
.../camel/itest/karaf/CamelRouteboxTest.java | 2 +-
.../apache/camel/itest/karaf/CamelRssTest.java | 2 +-
.../apache/camel/itest/karaf/CamelRubyTest.java | 2 +-
.../apache/camel/itest/karaf/CamelRxTest.java | 2 +-
.../camel/itest/karaf/CamelSalesforceTest.java | 2 +-
.../itest/karaf/CamelSapNetweaverTest.java | 2 +-
.../camel/itest/karaf/CamelSaxonTest.java | 2 +-
.../camel/itest/karaf/CamelScalaTest.java | 2 +-
.../camel/itest/karaf/CamelScriptTest.java | 2 +-
.../camel/itest/karaf/CamelServletTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSipTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSjmsTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSmppTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSnmpTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSoapTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSolrTest.java | 2 +-
.../camel/itest/karaf/CamelSplunkTest.java | 2 +-
.../camel/itest/karaf/CamelSpringBatchTest.java | 2 +-
.../itest/karaf/CamelSpringIntegrationTest.java | 2 +-
.../itest/karaf/CamelSpringJavaconfigTest.java | 2 +-
.../camel/itest/karaf/CamelSpringLdapTest.java | 2 +-
.../camel/itest/karaf/CamelSpringRedisTest.java | 2 +-
.../itest/karaf/CamelSpringWebServiceTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSqlTest.java | 2 +-
.../apache/camel/itest/karaf/CamelSshTest.java | 2 +-
.../apache/camel/itest/karaf/CamelStAXTest.java | 2 +-
.../camel/itest/karaf/CamelStompTest.java | 2 +-
.../camel/itest/karaf/CamelStreamTest.java | 2 +-
.../itest/karaf/CamelStringTemplateTest.java | 2 +-
.../camel/itest/karaf/CamelSyslogTest.java | 2 +-
.../camel/itest/karaf/CamelTagsoupTest.java | 2 +-
.../camel/itest/karaf/CamelTestSpringTest.java | 2 +-
.../apache/camel/itest/karaf/CamelTestTest.java | 2 +-
.../camel/itest/karaf/CamelTwitterTest.java | 2 +-
.../camel/itest/karaf/CamelUrlrewriteTest.java | 2 +-
.../camel/itest/karaf/CamelVelocityTest.java | 2 +-
.../camel/itest/karaf/CamelVertxTest.java | 2 +-
.../camel/itest/karaf/CamelWeatherTest.java | 2 +-
.../camel/itest/karaf/CamelWebsocketTest.java | 2 +-
.../camel/itest/karaf/CamelXmlbeansTest.java | 2 +-
.../camel/itest/karaf/CamelXmljsonTest.java | 2 +-
.../camel/itest/karaf/CamelXmlrpcTest.java | 2 +-
.../camel/itest/karaf/CamelXmlsecurityTest.java | 2 +-
.../apache/camel/itest/karaf/CamelXmppTest.java | 2 +-
.../camel/itest/karaf/CamelXstreamTest.java | 2 +-
.../camel/itest/karaf/CamelYammerTest.java | 2 +-
.../camel/itest/karaf/CamelZipfileTest.java | 2 +-
.../camel/itest/karaf/CamelZookeeperTest.java | 2 +-
140 files changed, 163 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 89589af..cd9b1cb 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
@@ -26,12 +26,13 @@ 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;
import org.junit.Before;
+
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.ops4j.pax.exam.options.UrlReference;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
@@ -41,6 +42,7 @@ import org.slf4j.LoggerFactory;
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.vmOption;
public abstract class AbstractFeatureTest {
@@ -167,10 +169,10 @@ public abstract class AbstractFeatureTest {
private static void switchPlatformEncodingToUTF8() {
try {
- System.setProperty("file.encoding","UTF-8");
+ System.setProperty("file.encoding", "UTF-8");
Field charset = Charset.class.getDeclaredField("defaultCharset");
charset.setAccessible(true);
- charset.set(null,null);
+ charset.set(null, null);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -190,29 +192,29 @@ public abstract class AbstractFeatureTest {
String karafVersion = getKarafVersion();
LOG.info("*** The karaf version is " + karafVersion + " ***");
- Option[] options =
- new Option[]{
- KarafDistributionOption.karafDistributionConfiguration()
- .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
- .karafVersion(karafVersion)
- .name("Apache Karaf")
- .useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
+ Option[] options = new Option[] {
+ KarafDistributionOption.karafDistributionConfiguration()
+ .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
+ .karafVersion(karafVersion)
+ .name("Apache Karaf")
+ .useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
- vmOption("-Dfile.encoding=UTF-8"),
+ 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")),
+ 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),
+ // 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)};
+ // 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/cfa10145/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 90abb6d..f888979 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 3c99fba..99cf5ac 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 d931eda..a743e1f 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 a7ca26c..cd5cb1d 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 f96902a..b5a0ebb 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 133cbb4..119bd95 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 b5514e5..49cc025 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 50aef64..3ba0fdf 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 645c6f4..b3a5352 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 0566d06..73ced33 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 f9f6dc4..21954a3 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 1793dca..1cb2d9b 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 0ae0d16..87807e0 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 0fd4aa8..22ab9b9 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 cbccfa1..dc8cb70 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 1107402..3790334 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 d280f18..7e2c126 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 712de11..0be6670 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 3abfdbd..c389eba 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 f0607bf..36aaaa7 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 100eb0e..1dcd0b0 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 9018950..4e68a2d 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 39750c5..1c5e9d3 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 d60c802..cfc4d29 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 88c7318..0711891 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 e90341d..a7d2540 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 f207a57..236ec0c 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 27c7f8e..e613c68 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 d916289..edceb4d 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 e035cda..d28efda 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 6a934aa..ff4e6af 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 95ab0fe..0babdb1 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 1020093..8c73c63 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
@@ -21,8 +21,8 @@ import org.apache.camel.model.dataformat.JsonDataFormat;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 2088615..296342b 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 7b1ef55..002bac2 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 6af04a1..429d0d3 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 cf5f84f..887816b 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 cf94d2e..5cc649b 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 d7d085a..8d35be9 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 0f39f31..71bbf48 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 817512d..3a6b4e5 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 ac1af2b..710e019 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 9071453..672e6c7 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 cd253fd..cb5743cb 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 f007a6f..e27309d 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 74b427a..3aa7b43 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
@@ -21,8 +21,8 @@ import org.apache.camel.model.dataformat.JsonDataFormat;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 216aed8..ce2b9d1 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 de2b09a..9aae8ba 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 2147b5c..87d7a55 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 46ebc2a..de660e3 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 3e70072..4c3f227 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 ee4a37f..b50d1cd 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 768d606..bed380e 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 6a5988b..34d3a9a 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 ab4b8e8..ae9a33b 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
@@ -20,8 +20,8 @@ import org.apache.camel.model.DataFormatDefinition;
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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 d1101ba..ab365b3 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 561b094..537ff6a 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 833056d..2f34840 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 c9fecdf..3a2e82f 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 ad0a56c..5aa559c 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 c03ee73..4f78f5a 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 fa1d51e..6a5e58e 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 96d2f1b..dc2d11c 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 e70a0d5..4003a06 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 0f6cf0f..fc13ec4 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 cd602fc..05538ba 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 eea6c99..6da6a95 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 44acd1b..a4332ae 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 1487b0c..c6cf7b9 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 0e6cf0c..6700fbd 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 7e878b5..26ba8f8 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 ba996cd..d267752 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 e3674e4..c0afeba 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 e822cf4..c77b34f 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 92016c5..b79b96f 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
@@ -19,8 +19,8 @@ package org.apache.camel.itest.karaf;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 4895c47..86508b5 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 2aecdf7..461214e 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 d0fbbff..119239d 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 ca01f74..ace1c04 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/cfa10145/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 72426a7..2c590cb 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
@@ -18,8 +18,8 @@ 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.Configuration;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)