Repository: camel Updated Branches: refs/heads/master 6a4a654f6 -> 92ffd5b2b
[itest-karaf] Added Camel snapshot repo to base test (so itest-karaf can be executed in CI sandbox). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92ffd5b2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92ffd5b2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92ffd5b2 Branch: refs/heads/master Commit: 92ffd5b2bd73358b8e7ff92b013c4ec09bf91f22 Parents: 6a4a654 Author: Henryk Konsek <hekon...@gmail.com> Authored: Fri Feb 21 13:44:57 2014 +0100 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Fri Feb 21 13:44:57 2014 +0100 ---------------------------------------------------------------------- .../camel/itest/karaf/AbstractFeatureTest.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/92ffd5b2/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 aeba7a4..1fcd1b0 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 @@ -34,6 +34,7 @@ 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; @@ -136,8 +137,10 @@ public abstract class AbstractFeatureTest { } public static UrlReference getCamelKarafFeatureUrl() { - return mavenBundle().groupId("org.apache.camel.karaf"). - artifactId("apache-camel").classifier("features").type("xml"); + return mavenBundle(). + groupId("org.apache.camel.karaf"). + artifactId("apache-camel"). + classifier("features").type("xml").versionAsInProject(); } public static UrlReference getKarafFeatureUrl() { @@ -162,7 +165,16 @@ public abstract class AbstractFeatureTest { 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")), - // we need INFO logging otherwise we cannot see what happens + // Add apache-snapshots repository + 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 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)};
