You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/11/08 15:54:30 UTC
svn commit: r1407109 - in /camel/branches/camel-2.10.x: ./ parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Thu Nov 8 14:54:29 2012
New Revision: 1407109
URL: http://svn.apache.org/viewvc?rev=1407109&view=rev
Log:
CAMEL-5779: camel-hbase can now install in karaf.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/parent/pom.xml
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1407104
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1407109&r1=1407108&r2=1407109&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Thu Nov 8 14:54:29 2012
@@ -99,6 +99,7 @@
<hawtdispatch-version>1.12</hawtdispatch-version>
<hazelcast-version>2.0.2</hazelcast-version>
<hbase-version>0.90.5</hbase-version>
+ <hbase-bundle-version>0.90.5_1</hbase-bundle-version>
<hibernate-version>3.6.10.Final</hibernate-version>
<hsqldb-version>2.2.8</hsqldb-version>
<httpunit-version>1.6.2</httpunit-version>
Modified: camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml?rev=1407109&r1=1407108&r2=1407109&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml Thu Nov 8 14:54:29 2012
@@ -379,7 +379,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
- <bundle>wrap:mvn:org.apache.hbase/hbase/${hbase-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hbase/${project.version}</bundle>
</feature>
<feature name='camel-hdfs' version='${project.version}' resolver='(obr)' start-level='50'>