Repository: camel Updated Branches: refs/heads/master d62b0c7e6 -> 7e355e0d0
Upgrade Kafka and related bundle to version 0.10.1.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cff262bf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cff262bf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cff262bf Branch: refs/heads/master Commit: cff262bfadef572383d2f54bba407d75187580ae Parents: d62b0c7 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Nov 8 08:26:08 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Nov 8 08:26:08 2016 +0100 ---------------------------------------------------------------------- .../camel/component/kafka/embedded/EmbeddedKafkaCluster.java | 7 ++++++- .../org/apache/camel/component/kafka/embedded/SystemTime.java | 5 +++++ parent/pom.xml | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cff262bf/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 37f3b21..ca0d68a 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 @@ -25,10 +25,13 @@ import java.util.Properties; import kafka.admin.AdminUtils; import kafka.admin.RackAwareMode; +import kafka.metrics.KafkaMetricsReporter; import kafka.server.KafkaConfig; import kafka.server.KafkaServer; import kafka.utils.ZkUtils; import scala.Option; +import scala.collection.Seq; +import scala.collection.mutable.Buffer; public class EmbeddedKafkaCluster { private final List<Integer> ports; @@ -123,7 +126,9 @@ public class EmbeddedKafkaCluster { private KafkaServer startBroker(Properties props) { - KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty()); + 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); server.startup(); return server; } http://git-wip-us.apache.org/repos/asf/camel/blob/cff262bf/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java index 7ad4965..2a9793a 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java @@ -34,4 +34,9 @@ class SystemTime implements Time { // Ignore } } + + @Override + public long hiResClockMs() { + return 0; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/cff262bf/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 951daee..8262a2d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -373,8 +373,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.0.1</kafka-version> - <kafka-bundle-version>0.10.0.1_1</kafka-bundle-version> + <kafka-version>0.10.1.0</kafka-version> + <kafka-bundle-version>0.10.1.0_1</kafka-bundle-version> <karaf-version>2.4.4</karaf-version> <karaf3-version>3.0.8</karaf3-version> <karaf4-version>4.0.7</karaf4-version>
