[CAMEL-9361] Upgrade kafka to 0.9.0.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9addd564 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9addd564 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9addd564 Branch: refs/heads/master Commit: 9addd5640e2dfaa7b7ce89b334e0e05ddb0c36ea Parents: 64c350b Author: James Netherton <[email protected]> Authored: Thu Nov 26 13:59:48 2015 +0000 Committer: Andrea Cosentino <[email protected]> Committed: Fri Dec 4 12:11:29 2015 +0100 ---------------------------------------------------------------------- .../component/kafka/embedded/EmbeddedKafkaCluster.java | 11 ++++++----- parent/pom.xml | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9addd564/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java index f23dd46..24a80a2 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java @@ -26,7 +26,8 @@ import java.util.Properties; import kafka.admin.AdminUtils; import kafka.server.KafkaConfig; import kafka.server.KafkaServer; -import org.I0Itec.zkclient.ZkClient; +import kafka.utils.ZkUtils; +import scala.Option; public class EmbeddedKafkaCluster { private final List<Integer> ports; @@ -56,16 +57,16 @@ public class EmbeddedKafkaCluster { this.brokerList = constructBrokerList(this.ports); } - public ZkClient getZkClient() { + public ZkUtils getZkUtils() { for (KafkaServer server : brokers) { - return server.zkClient(); + return server.zkUtils(); } return null; } public void createTopics(String...topics) { for (String topic : topics) { - AdminUtils.createTopic(getZkClient(), topic, 2, 1, new Properties()); + AdminUtils.createTopic(getZkUtils(), topic, 2, 1, new Properties()); } } @@ -121,7 +122,7 @@ public class EmbeddedKafkaCluster { private KafkaServer startBroker(Properties props) { - KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime()); + KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty()); server.startup(); return server; } http://git-wip-us.apache.org/repos/asf/camel/blob/9addd564/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 722430d..8dae204 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -321,9 +321,9 @@ <junit-version>4.11</junit-version> <jython-version>2.5.3</jython-version> <jzlib-version>1.1.3</jzlib-version> - <kafka-version>0.8.2.2</kafka-version> - <kafka-bundle-version>0.8.2.2_1</kafka-bundle-version> - <kafka-clients-bundle-version>0.8.2.2_1</kafka-clients-bundle-version> + <kafka-version>0.9.0.0</kafka-version> + <kafka-bundle-version>0.9.0.0_1</kafka-bundle-version> + <kafka-clients-bundle-version>0.9.0.0_1</kafka-clients-bundle-version> <karaf-version>2.4.3</karaf-version> <karaf3-version>3.0.2</karaf3-version> <kie-version>6.3.0.Final</kie-version>
