You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/05 08:20:48 UTC
[camel] branch master updated: Upgrade Kafka and related bundle to
version 2.3.0
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 467500f Upgrade Kafka and related bundle to version 2.3.0
467500f is described below
commit 467500f2a79c21d25fd895ba7d496ce7da5db015
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 10:19:09 2019 +0200
Upgrade Kafka and related bundle to version 2.3.0
---
.../java/org/apache/camel/component/kafka/embedded/SystemTime.java | 7 +++++++
parent/pom.xml | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
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 8e9a9cc..9d89610 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
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.kafka.embedded;
+import java.util.function.Supplier;
+
import org.apache.kafka.common.utils.Time;
class SystemTime implements Time {
@@ -43,4 +45,9 @@ class SystemTime implements Time {
public long hiResClockMs() {
return 0;
}
+
+ @Override
+ public void waitObject(Object obj, Supplier<Boolean> condition, long timeoutMs) throws InterruptedException {
+ // NOOP
+ }
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 0a247ee..38cc3ff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -393,8 +393,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>2.2.1</kafka-version>
- <kafka-bundle-version>2.2.1_1</kafka-bundle-version>
+ <kafka-version>2.3.0</kafka-version>
+ <kafka-bundle-version>2.3.0_1</kafka-bundle-version>
<karaf4-version>4.2.6</karaf4-version>
<!-- Avoid upgrading to newer version for the moment: see https://issues.apache.org/jira/browse/CAMEL-13654 -->
<kie-version>7.22.0.Final</kie-version>