Author: davsclaus
Date: Wed Mar 13 10:17:21 2013
New Revision: 1455866
URL: http://svn.apache.org/r1455866
Log:
Added camel-rx as a feature
Modified:
camel/trunk/components/camel-rx/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-rx/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rx/pom.xml?rev=1455866&r1=1455865&r2=1455866&view=diff
==============================================================================
--- camel/trunk/components/camel-rx/pom.xml (original)
+++ camel/trunk/components/camel-rx/pom.xml Wed Mar 13 10:17:21 2013
@@ -31,13 +31,8 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.rx.*</camel.osgi.export.pkg>
-<!--
- <camel.osgi.export.service>
- </camel.osgi.export.service>
--->
</properties>
-
<dependencies>
<dependency>
@@ -48,7 +43,7 @@
<dependency>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
- <version>0.6.0</version>
+ <version>${rxjava-version}</version>
</dependency>
<!-- test dependencies -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1455866&r1=1455865&r2=1455866&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Mar 13 10:17:21 2013
@@ -317,6 +317,7 @@
<rhino-version>1.7R2</rhino-version>
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
+ <rxjava-version>0.6.0</rxjava-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.4.0.4_2</saxon-bundle-version>
<saxon-version>9.4.0.4</saxon-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1455866&r1=1455865&r2=1455866&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed
Mar 13 10:17:21 2013
@@ -714,6 +714,11 @@
<feature version='${project.version}'>camel-script</feature>
<bundle>mvn:org.jruby/jruby/${jruby-version}</bundle>
</feature>
+ <feature name='camel-rx' version='${project.version}' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:com.netflix.rxjava/rxjava-core/${rxjava-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-rx/${project.version}</bundle>
+ </feature>
<feature name='camel-saxon' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
