camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [camel] branch master updated: Upgrade Kafka and related bundle to version 1.1.0
Date Mon, 04 Jun 2018 06:27:23 GMT
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new b8d0c4d  Upgrade Kafka and related bundle to version 1.1.0
b8d0c4d is described below

commit b8d0c4de42514a13172930298aa743980a393e1c
Author: Andrea Cosentino <ancosen@gmail.com>
AuthorDate: Mon Jun 4 08:26:45 2018 +0200

    Upgrade Kafka and related bundle to version 1.1.0
---
 .../camel/component/kafka/embedded/EmbeddedKafkaBroker.java       | 8 +++++++-
 parent/pom.xml                                                    | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaBroker.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaBroker.java
index bda7afc..5dae04f 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaBroker.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaBroker.java
@@ -50,6 +50,7 @@ public class EmbeddedKafkaBroker extends ExternalResource {
 
     private KafkaServer kafkaServer;
     private File logDir;
+    private ZkUtils zkUtils = null;
 
     public EmbeddedKafkaBroker(int brokerId, String zkConnection) {
         this(brokerId, AvailablePortFinder.getNextAvailable(), zkConnection, new Properties());
@@ -66,7 +67,7 @@ public class EmbeddedKafkaBroker extends ExternalResource {
     }
 
     public ZkUtils getZkUtils() {
-        return kafkaServer.zkUtils();
+        return zkUtils;
     }
 
     public void createTopic(String topic, int partitionCount) {
@@ -94,6 +95,11 @@ public class EmbeddedKafkaBroker extends ExternalResource {
 
 
     private KafkaServer startBroker(Properties props) {
+    	zkUtils = ZkUtils.apply(
+    			zkConnection,
+                30000,
+                30000,
+                false);
         List<KafkaMetricsReporter> kmrList = new ArrayList<>();
         Buffer<KafkaMetricsReporter> metricsList = scala.collection.JavaConversions.asScalaBuffer(kmrList);
         KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty(),
metricsList);
diff --git a/parent/pom.xml b/parent/pom.xml
index 4d620ae..f116844 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -438,8 +438,8 @@
     <jython-version>2.5.3</jython-version>
     <jzlib-version>1.1.3</jzlib-version>
     <jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
-    <kafka-version>1.0.1</kafka-version>
-    <kafka-bundle-version>1.0.1_1</kafka-bundle-version>
+    <kafka-version>1.1.0</kafka-version>
+    <kafka-bundle-version>1.1.0_1</kafka-bundle-version>
     <karaf2-version>2.4.4</karaf2-version>
     <karaf4-version>4.2.0</karaf4-version>
     <kie-version>7.3.0.Final</kie-version>

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.

Mime
View raw message