camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1441350 - in /camel/trunk: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Date Fri, 01 Feb 2013 08:57:34 GMT
Author: davsclaus
Date: Fri Feb  1 08:57:34 2013
New Revision: 1441350

URL: http://svn.apache.org/viewvc?rev=1441350&view=rev
Log:
Added camel-gae feature

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1441350&r1=1441349&r2=1441350&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Feb  1 08:57:34 2013
@@ -85,7 +85,6 @@
     <commons-digester-version>2.1</commons-digester-version>
     <commons-exec-version>1.1</commons-exec-version>
     <commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
-    <commons-io-bundle-version>1.4_3</commons-io-bundle-version>
     <commons-io-version>1.4</commons-io-version>
     <commons-jexl2-version>2.0.1</commons-jexl2-version>
     <commons-jxpath-version>1.3</commons-jxpath-version>
@@ -144,7 +143,9 @@
     <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
     <gmaven-plugin-version>1.4</gmaven-plugin-version>
     <google-app-engine-version>1.7.4</google-app-engine-version>
+    <google-app-engine-bundle-version>1.7.4_1</google-app-engine-bundle-version>
     <google-gdata-version>1.41.5.w1</google-gdata-version>
+    <google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
     <google-guava-version>13.0.1</google-guava-version>
     <groovy-version>2.1.0</groovy-version>
     <gson-version>2.2.2</gson-version>
@@ -261,6 +262,7 @@
     <maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version>
     <maven-war-plugin-version>2.3</maven-war-plugin-version>
     <maven-version>2.0</maven-version>
+    <neo4j-version>1.8</neo4j-version>
     <mina-bundle-version>1.1.7_6</mina-bundle-version>
     <mina-version>1.1.7</mina-version>
     <mina2-version>2.0.7</mina2-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=1441350&r1=1441349&r2=1441350&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri Feb  1 08:57:34
2013
@@ -273,12 +273,16 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-ftp/${project.version}</bundle>
   </feature>
-<!-- TODO: camel-gae feature needs to be completed
   <feature name='camel-gae' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
+    <feature version='${project.version}'>camel-servlet</feature>
+    <feature version='${project.version}'>camel-spring</feature>
+    <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
+    <bundle dependency="true">mvn:com.google.guava/guava/${google-guava-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gdata/${google-gdata-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gae/${google-app-engine-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-gae/${project.version}</bundle>
   </feature>
--->
   <feature name='camel-groovy' 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.ant/${ant-bundle-version}</bundle>
@@ -639,9 +643,10 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsendnsca-core/${jsendnsca-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-nagios/${project.version}</bundle>
   </feature>
-<!-- TODO: camel-neo4j feature needs to be completed
+<!-- TODO: Need SMX4-1374
   <feature name='camel-neo4j' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
+    <bundle dependency='true'>mvn:org.springframework.data/spring-data-neo4j-rest/${spring-neo4j-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-neo4j/${project.version}</bundle>
   </feature>
 -->



Mime
View raw message