Author: janstey
Date: Thu Dec 1 13:54:42 2011
New Revision: 1209081
URL: http://svn.apache.org/viewvc?rev=1209081&view=rev
Log:
Move apache-camel and apache-cxf feature dependencies to parent. The versions
didn't resolve in the root pom.
Modified:
servicemix/smx4/features/trunk/parent/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1209081&r1=1209080&r2=1209081&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Thu Dec 1 13:54:42 2011
@@ -64,6 +64,22 @@
</dependency>
<dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>apache-camel</artifactId>
+ <version>${camel.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf.karaf</groupId>
+ <artifactId>apache-cxf</artifactId>
+ <version>${cxf.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>org.apache.servicemix.features.branding</artifactId>
<version>${project.version}</version>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1209081&r1=1209080&r2=1209081&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Dec 1 13:54:42 2011
@@ -222,24 +222,6 @@
<version>${felix.prefs.version}</version>
</dependency>
- <!-- Camel -->
- <dependency>
- <groupId>org.apache.camel.karaf</groupId>
- <artifactId>apache-camel</artifactId>
- <version>${camel.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf.karaf</groupId>
- <artifactId>apache-cxf</artifactId>
- <version>${cxf.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
-
<!-- Geronimo -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>