[2/3] camel git commit: CAMEL-9031: Adding missing zkclient dependency from camel-kafka feature Conflicts: parent/pom.xml

[davsclaus]

CAMEL-9031: Adding missing zkclient dependency from camel-kafka feature
Conflicts:
        parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f661d059
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f661d059
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f661d059

Branch: refs/heads/camel-2.15.x
Commit: f661d0595fc42efcb32e7c707b795e76d766e4b4
Parents: 455da16
Author: Andrew Block <andy.bl...@gmail.com>
Authored: Tue Jul 28 23:17:05 2015 -0500
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Wed Jul 29 09:12:19 2015 +0200

----------------------------------------------------------------------
 parent/pom.xml                                           | 5 +++--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f661d059/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b289917..7620c67 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -515,9 +515,10 @@
     <xstream-version>1.4.8</xstream-version>
     <xom-version>1.2.5</xom-version>
     <yammer-metrics-version>2.2.0</yammer-metrics-version>
-    <zxing-version>3.0.0</zxing-version>
-       <zxing-bundle-version>3.0.1_1</zxing-bundle-version>
+    <zkclient-version>0.3</zkclient-version>
     <zookeeper-version>3.4.6</zookeeper-version>
+    <zxing-version>3.2.0</zxing-version>
+    <zxing-bundle-version>3.2.0_1</zxing-bundle-version>
 
     <!-- OSGi bundles properties -->
     
<camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>

http://git-wip-us.apache.org/repos/asf/camel/blob/f661d059/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 bb8a058..2a481dc 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -873,6 +873,7 @@
   <feature name='camel-kafka' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <bundle 
dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+    <bundle 
dependency="true">wrap:mvn:com.101tec/zkclient/${zkclient-version}$Bundle-Version=${zkclient-version}&amp;Export-Package=*;-noimport:=true;version="${zkclient-version}"</bundle>
     <bundle 
dependency='true'>wrap:mvn:com.yammer.metrics/metrics-core/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&amp;Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle>
     <bundle 
dependency='true'>wrap:mvn:com.yammer.metrics/metrics-annotation/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&amp;Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka-bundle-version}</bundle>