Repository: camel Updated Branches: refs/heads/master 5fcb0261c -> 82dd8e195
Upgrade Kafka bundle to version 0.8.2.1_1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82dd8e19 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82dd8e19 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82dd8e19 Branch: refs/heads/master Commit: 82dd8e195157f4ba3f0526e0ec04a3f502e98a4d Parents: 5fcb026 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Jun 2 16:55:48 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Jun 2 21:00:35 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/82dd8e19/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b0d238b..59d85ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -309,7 +309,8 @@ <jython-version>2.5.3</jython-version> <jzlib-version>1.1.3</jzlib-version> <kafka-version>0.8.2.1</kafka-version> - <kafka-bundle-version>0.8.2.0_1</kafka-bundle-version> + <kafka-bundle-version>0.8.2.1_1</kafka-bundle-version> + <kafka-clients-bundle-version>0.8.2.0_1</kafka-clients-bundle-version> <karaf-version>2.4.2</karaf-version> <karaf3-version>3.0.2</karaf3-version> <kie-version>6.2.0.Final</kie-version> http://git-wip-us.apache.org/repos/asf/camel/blob/82dd8e19/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 23955a2..a969971 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -908,7 +908,7 @@ <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-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-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka-clients-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka_2.10/${kafka-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-kafka/${project.version}</bundle>