Repository: camel Updated Branches: refs/heads/master 14dc783dd -> bc46079f8
Upgrade Kafka and related bundle to version 0.11.0.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc46079f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc46079f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc46079f Branch: refs/heads/master Commit: bc46079f8750efe6f089c2aa613507cc9df0d1cf Parents: 14dc783 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Jul 14 09:01:29 2017 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Jul 14 09:01:29 2017 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/kafka/KafkaProducerTest.java | 6 +++--- .../camel/component/kafka/embedded/EmbeddedKafkaBroker.java | 1 + parent/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bc46079f/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java index 256208e..814e809 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java @@ -68,7 +68,7 @@ public class KafkaProducerTest { fromEndpoint = kafka.createEndpoint("kafka:fromtopic", "fromtopic", new HashMap()); - RecordMetadata rm = new RecordMetadata(null, 1, 1); + RecordMetadata rm = new RecordMetadata(null, 0, 0, 0, new Long(0), 0, 0); Future future = Mockito.mock(Future.class); Mockito.when(future.get()).thenReturn(rm); org.apache.kafka.clients.producer.KafkaProducer kp = Mockito.mock(org.apache.kafka.clients.producer.KafkaProducer.class); @@ -131,7 +131,7 @@ public class KafkaProducerTest { ArgumentCaptor<Callback> callBackCaptor = ArgumentCaptor.forClass(Callback.class); Mockito.verify(producer.getKafkaProducer()).send(Matchers.any(ProducerRecord.class), callBackCaptor.capture()); Callback kafkaCallback = callBackCaptor.getValue(); - kafkaCallback.onCompletion(new RecordMetadata(null, 1, 1), null); + kafkaCallback.onCompletion(new RecordMetadata(null, 0, 0, 0, new Long(0), 0, 0), null); assertRecordMetadataExists(); } @@ -154,7 +154,7 @@ public class KafkaProducerTest { Mockito.verify(exchange).setException(Matchers.isA(ApiException.class)); Mockito.verify(callback).done(Matchers.eq(true)); Callback kafkaCallback = callBackCaptor.getValue(); - kafkaCallback.onCompletion(new RecordMetadata(null, 1, 1), null); + kafkaCallback.onCompletion(new RecordMetadata(null, 0, 0, 0, new Long(0), 0, 0), null); assertRecordMetadataExists(); } http://git-wip-us.apache.org/repos/asf/camel/blob/bc46079f/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaBroker.java ---------------------------------------------------------------------- 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 3254bc7..bda7afc 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 @@ -87,6 +87,7 @@ public class EmbeddedKafkaBroker extends ExternalResource { properties.setProperty("auto.create.topics.enable", String.valueOf(Boolean.TRUE)); log.info("log directory: " + logDir.getAbsolutePath()); properties.setProperty("log.flush.interval.messages", String.valueOf(1)); + properties.setProperty("offsets.topic.replication.factor", String.valueOf(1)); kafkaServer = startBroker(properties); } http://git-wip-us.apache.org/repos/asf/camel/blob/bc46079f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ecda208..d06e1e4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -418,8 +418,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>0.10.2.1</kafka-version> - <kafka-bundle-version>0.10.2.1_1</kafka-bundle-version> + <kafka-version>0.11.0.0</kafka-version> + <kafka-bundle-version>0.11.0.0_1</kafka-bundle-version> <karaf-version>2.4.4</karaf-version> <karaf3-version>3.0.8</karaf3-version> <karaf4-version>4.1.1</karaf4-version>
