Repository: camel Updated Branches: refs/heads/camel-2.15.x 455da16c7 -> 218bb3d16 refs/heads/master 9be702341 -> d49b9c2f2
CAMEL-9031: Adding missing zkclient dependency from camel-kafka feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d49b9c2f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d49b9c2f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d49b9c2f Branch: refs/heads/master Commit: d49b9c2f2a71eed93eeb0739a2d7165128a9a8b3 Parents: 9be7023 Author: Andrew Block <andy.bl...@gmail.com> Authored: Tue Jul 28 23:17:05 2015 -0500 Committer: Andrew Block <andy.bl...@gmail.com> Committed: Tue Jul 28 23:17:05 2015 -0500 ---------------------------------------------------------------------- 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/d49b9c2f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index edd879a..543783d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -532,9 +532,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.2.0</zxing-version> - <zxing-bundle-version>3.2.0_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/d49b9c2f/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 ea4d0c2..b3f69b1 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -916,6 +916,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}&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}&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}&Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka-clients-bundle-version}</bundle>
