You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/05/25 19:11:15 UTC
svn commit: r1342737 - in /camel/trunk: parent/pom.xml
tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml
Author: ningjiang
Date: Fri May 25 17:11:14 2012
New Revision: 1342737
URL: http://svn.apache.org/viewvc?rev=1342737&view=rev
Log:
CAMEL-5239 polish the pom
Modified:
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-karaf/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1342737&r1=1342736&r2=1342737&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri May 25 17:11:14 2012
@@ -142,7 +142,8 @@
<ognl-version>3.0.4_1</ognl-version>
<osgi-version>4.2.0</osgi-version>
<paranamer-bundle-version>2.4_1</paranamer-bundle-version>
- <pax-exam-version>1.2.4</pax-exam-version>
+ <pax-exam-version>2.3.0</pax-exam-version>
+ <paxexam-karaf-container-version>0.5.3</paxexam-karaf-container-version>
<pax-runner-version>1.6.1</pax-runner-version>
<pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
<pax-logging-version>1.5.3</pax-logging-version>
Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1342737&r1=1342736&r2=1342737&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Fri May 25 17:11:14 2012
@@ -33,10 +33,6 @@
<name>Camel :: Integration Tests :: Karaf</name>
<description>Performs Karaf compliance integration tests</description>
- <properties>
- <pax-exam-version>2.3.0</pax-exam-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -57,7 +53,7 @@
<dependency>
<groupId>org.openengsb.labs.paxexam.karaf</groupId>
<artifactId>paxexam-karaf-container</artifactId>
- <version>0.5.3</version>
+ <version>${paxexam-karaf-container-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1342737&r1=1342736&r2=1342737&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Fri May 25 17:11:14 2012
@@ -40,23 +40,7 @@
</repository>
</repositories>
- <properties>
- <pax-exam-version>2.3.0</pax-exam-version>
- </properties>
-
<dependencies>
- <!--dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-paxrunner</artifactId>
- <version>${pax-exam-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax-exam-version}</version>
- <scope>test</scope>
- </dependency-->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
@@ -76,7 +60,7 @@
<dependency>
<groupId>org.openengsb.labs.paxexam.karaf</groupId>
<artifactId>paxexam-karaf-container</artifactId>
- <version>0.5.3</version>
+ <version>${paxexam-karaf-container-version}</version>
<scope>test</scope>
</dependency>
<dependency>