Author: davsclaus
Date: Tue Mar 12 08:02:50 2013
New Revision: 1455431
URL: http://svn.apache.org/r1455431
Log:
Working on camel-spring-neo4j 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=1455431&r1=1455430&r2=1455431&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Mar 12 08:02:50 2013
@@ -80,11 +80,13 @@
<commons-codec-version>1.6</commons-codec-version>
<commons-collections-version>3.2.1</commons-collections-version>
<commons-configuration-version>1.8</commons-configuration-version>
+
<commons-configuration-bundle-version>1.9_1</commons-configuration-bundle-version>
<commons-csv-bundle-version>1.0-r706899_5</commons-csv-bundle-version>
<commons-cli-version>1.2</commons-cli-version>
<commons-daemon-version>1.0.5</commons-daemon-version>
<commons-dbcp-bundle-version>1.4_3</commons-dbcp-bundle-version>
<commons-dbcp-version>1.4</commons-dbcp-version>
+ <commons-digester-1x-version>1.8.1</commons-digester-1x-version>
<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>
@@ -143,6 +145,7 @@
<geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
<geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>
<geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version>
+ <geronimo-jsp-spec-version>1.1</geronimo-jsp-spec-version>
<geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
<geronimo-servlet-spec-version>1.2</geronimo-servlet-spec-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
@@ -267,6 +270,7 @@
<maven-war-plugin-version>2.3</maven-war-plugin-version>
<maven-version>2.0</maven-version>
<neo4j-version>1.8</neo4j-version>
+ <neo4j-bundle-version>1.8_1</neo4j-bundle-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>
@@ -336,6 +340,7 @@
<solr-version>3.6.1</solr-version>
<spring-batch-version>2.1.9.RELEASE</spring-batch-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
+ <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
<spring-data-redis-version>1.0.3.RELEASE</spring-data-redis-version>
<spring-integration-version>2.2.2.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-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=1455431&r1=1455430&r2=1455431&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Mar 12 08:02:50 2013
@@ -840,10 +840,27 @@
<bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
</feature>
-->
-<!-- TODO: Need SMX4-1374
+ <!-- TODO: does not work due SMX4-1400
<feature name='camel-spring-neo4j' version='${project.version}'
resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
+ <feature version='${project.version}'>camel-spring</feature>
+ <bundle
dependency='true'>mvn:org.springframework.data/spring-data-neo4j/${spring-neo4j-version}</bundle>
<bundle
dependency='true'>mvn:org.springframework.data/spring-data-neo4j-rest/${spring-neo4j-version}</bundle>
+ <bundle
dependency='true'>mvn:org.springframework.data/spring-data-commons/${spring-data-commons-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neo4j/${neo4j-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-spec-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jsp_2.2_spec/${geronimo-jsp-spec-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version-xmljson}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-1x-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-neo4j/${project.version}</bundle>
</feature>
-->
