You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/01/05 15:22:20 UTC
[2/3] camel git commit: CAMEL-10672: Karaf itests will now have to
specify the org.apache.camel.karaf/apache-camel version to use through the
camelKarafFeatureVersion system property
CAMEL-10672: Karaf itests will now have to specify the org.apache.camel.karaf/apache-camel version to use through the camelKarafFeatureVersion system property
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8322cb7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8322cb7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8322cb7
Branch: refs/heads/master
Commit: c8322cb78253d208907098a5a6a0ac863a9ec93b
Parents: 1c1205d
Author: jpoth <po...@gmail.com>
Authored: Wed Jan 4 17:06:20 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jan 5 16:11:00 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/test/karaf/AbstractFeatureTest.java | 11 ++++++++++-
tests/camel-itest-karaf/pom.xml | 1 +
tests/camel-itest-osgi/pom.xml | 5 ++---
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c8322cb7/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
index 97b876b..050a1d4 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
@@ -219,7 +219,16 @@ public abstract class AbstractFeatureTest {
return mavenBundle().
groupId("org.apache.camel.karaf").
artifactId("apache-camel").
- versionAsInProject().type("xml/features");
+ version(getCamelKarafFeatureVersion()).
+ type("xml/features");
+ }
+
+ private static String getCamelKarafFeatureVersion() {
+ String camelKarafFeatureVersion = System.getProperty("camelKarafFeatureVersion");
+ if (camelKarafFeatureVersion == null) {
+ throw new RuntimeException("Please specify the maven artifact version to use for org.apache.camel.karaf/apache-camel through the camelKarafFeatureVersion System property");
+ }
+ return camelKarafFeatureVersion;
}
private static void switchPlatformEncodingToUTF8() {
http://git-wip-us.apache.org/repos/asf/camel/blob/c8322cb7/tests/camel-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 0576fb5..4fe345a 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -231,6 +231,7 @@
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
<systemPropertyVariables>
<karafVersion>${karaf-version}</karafVersion>
+ <camelKarafFeatureVersion>${project.version}</camelKarafFeatureVersion>
</systemPropertyVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/c8322cb7/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 5bd725f..c3eed42 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -29,9 +29,8 @@
<artifactId>camel-itest-osgi</artifactId>
<name>Camel :: Integration Tests :: OSGi</name>
<description>Performs OSGi compliance integration tests</description>
-
+
<dependencies>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-karaf</artifactId>
@@ -42,7 +41,6 @@
<artifactId>camel-jackson</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
@@ -58,6 +56,7 @@
<!--<rerunFailingTestsCount>0</rerunFailingTestsCount>-->
<systemPropertyVariables>
<karafVersion>${karaf4-version}</karafVersion>
+ <camelKarafFeatureVersion>${project.version}</camelKarafFeatureVersion>
</systemPropertyVariables>
</configuration>
</plugin>