You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/06/07 07:26:31 UTC
[3/8] camel git commit: CAMEL-11260: Use Couchbase client OSGi bundle
in Karaf feature
CAMEL-11260: Use Couchbase client OSGi bundle in Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5714b758
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5714b758
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5714b758
Branch: refs/heads/master
Commit: 5714b75836a32cb40dce33cea94d5980d5658dcf
Parents: e9d1c4d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Jun 7 08:27:38 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jun 7 09:14:04 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5714b758/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4d9a87e..3055d72 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -163,6 +163,7 @@
<consul-client-bundle-version>0.14.0_1</consul-client-bundle-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<couchbase-client-version>1.4.13</couchbase-client-version>
+ <couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
<curator-version>2.11.1</curator-version>
<cxf-version>3.1.11</cxf-version>
<cxf-version-range>[3.0,4.0)</cxf-version-range>
http://git-wip-us.apache.org/repos/asf/camel/blob/5714b758/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ec3356d..e60d164 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -414,7 +414,7 @@
<feature name='camel-couchbase' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>wrap:mvn:net.spy/spymemcached/${spymemcached-version}</bundle>
- <bundle dependency='true'>wrap:mvn:com.couchbase.client/couchbase-client/${couchbase-client-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.couchbase-client/${couchbase-client-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-couchbase/${project.version}</bundle>
</feature>
<feature name='camel-crypto' version='${project.version}' resolver='(obr)' start-level='50'>