Author: boday
Date: Tue Dec 6 17:03:26 2011
New Revision: 1211025
URL: http://svn.apache.org/viewvc?rev=1211025&view=rev
Log:
updated camel-solr to use solr 3.5.0 and its karaf feature to use the SMX Solrj
bundle (still snapshot version)
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/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=1211025&r1=1211024&r2=1211025&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 6 17:03:26 2011
@@ -144,7 +144,7 @@
<slf4j-version>1.6.1</slf4j-version>
<smack-version>3.2.0</smack-version>
<snmp4j-version>1.8.1_5</snmp4j-version>
- <solr-version>3.4.0</solr-version>
+ <solr-version>3.5.0</solr-version>
<spring-integration-version>2.0.5.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-version>3.0.6.RELEASE</spring-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1211025&r1=1211024&r2=1211025&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Dec 6 17:03:26 2011
@@ -116,6 +116,7 @@
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_4</serp-bundle-version>
<smack-bundle-version>3.2.0_1</smack-bundle-version>
+ <solrj-bundle-version>3.5.0_1-SNAPSHOT</solrj-bundle-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-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=1211025&r1=1211024&r2=1211025&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Dec 6 17:03:26 2011
@@ -597,7 +597,7 @@
</feature>
<feature name='camel-solr' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
- <bundle
dependency="true">wrap:mvn:org.apache.solr/solr-solrj/${solr-version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solrj-bundle-version}</bundle>
<bundle
dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-solr/${pom.version}</bundle>
