Author: ningjiang
Date: Thu Apr 7 11:02:52 2011
New Revision: 1089821
URL: http://svn.apache.org/viewvc?rev=1089821&view=rev
Log:
Moved the karaf-version to parent/pom
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/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=1089821&r1=1089820&r2=1089821&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Apr 7 11:02:52 2011
@@ -51,7 +51,7 @@
<commons-collections-version>3.2.1</commons-collections-version>
<commons-pool-version>1.5.4</commons-pool-version>
<commons-dbcp-version>1.3</commons-dbcp-version>
- <cxf-version>2.3.3</cxf-version>
+ <cxf-version>2.4.0-SNAPSHOT</cxf-version>
<cxf-xjc-utils-version>2.3.2</cxf-xjc-utils-version>
<derby-version>10.4.2.0</derby-version>
<dnsjava-version>2.1.0</dnsjava-version>
@@ -101,6 +101,7 @@
<jsch-version>0.1.44</jsch-version>
<juel-version>2.1.2</juel-version>
<junit-version>4.8.1</junit-version>
+ <karaf-version>2.2.0</karaf-version>
<log4j-version>1.2.16</log4j-version>
<lucene-version>3.0.3</lucene-version>
<mina-version>1.1.7</mina-version>
Modified: camel/trunk/platforms/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=1089821&r1=1089820&r2=1089821&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Thu Apr 7 11:02:52 2011
@@ -33,10 +33,6 @@
<version>2.8-SNAPSHOT</version>
<name>Camel :: Platforms :: Apache Karaf</name>
- <properties>
- <karaf-version>2.2.0</karaf-version>
- </properties>
-
<modules>
<module>features</module>
</modules>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1089821&r1=1089820&r2=1089821&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Thu Apr 7 11:02:52 2011
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>org.apache.karaf.tooling.testing</artifactId>
- <version>2.2.0</version>
+ <version>${karaf-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.karaf</groupId>
