Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 10F8110C74 for ; Fri, 4 Dec 2015 11:21:00 +0000 (UTC) Received: (qmail 78545 invoked by uid 500); 4 Dec 2015 11:20:59 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 78474 invoked by uid 500); 4 Dec 2015 11:20:59 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 78277 invoked by uid 99); 4 Dec 2015 11:20:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2015 11:20:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B492EE17F6; Fri, 4 Dec 2015 11:20:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acosentino@apache.org To: commits@camel.apache.org Date: Fri, 04 Dec 2015 11:21:04 -0000 Message-Id: <25d2851c43de40c0b37389ea77fa727d@git.apache.org> In-Reply-To: <8c5dce674e4747dfa52f4020e0482105@git.apache.org> References: <8c5dce674e4747dfa52f4020e0482105@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] camel git commit: [CAMEL-9361] Upgrade kafka to 0.9.0.0 [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 Authored: Thu Nov 26 13:59:48 2015 +0000 Committer: Andrea Cosentino 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 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.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 @@ 4.11

2.5.3

1.1.3 - 0.8.2.2 - 0.8.2.2_1 - 0.8.2.2_1 + 0.9.0.0 + 0.9.0.0_1 + 0.9.0.0_1

2.4.3

3.0.2

6.3.0.Final