This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/main by this push:
new 23443bb0 Bump kafka.version from 3.3.2 to 3.9.0 (#390)
23443bb0 is described below
commit 23443bb0c2749f5a5820337b807d7369aaea196d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Feb 12 20:27:34 2025 +0100
Bump kafka.version from 3.3.2 to 3.9.0 (#390)
* Bump kafka.version from 3.3.2 to 3.9.0
Bumps `kafka.version` from 3.3.2 to 3.9.0.
Updates `org.apache.kafka:kafka-clients` from 3.3.2 to 3.9.0
Updates `org.apache.kafka:kafka_2.12` from 3.3.2 to 3.9.0
---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
dependency-type: direct:development
update-type: version-update:semver-minor
- dependency-name: org.apache.kafka:kafka_2.12
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Fix kafka appender/collector headers
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JB Onofré <[email protected]>
---
appender/kafka/pom.xml | 3 ++
.../appender/kafka/EmbeddedKafkaBroker.java | 4 +-
.../decanter/appender/kafka/TestSystemTime.java | 63 ++++++++++++++++++++++
collector/kafka/pom.xml | 5 +-
pom.xml | 2 +-
5 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/appender/kafka/pom.xml b/appender/kafka/pom.xml
index aa92d5a8..81c00afe 100644
--- a/appender/kafka/pom.xml
+++ b/appender/kafka/pom.xml
@@ -102,9 +102,11 @@
!com.fasterxml.jackson*,
!org.jose4j*,
!kafka,
+ !com.google.common*,
com.github.luben.zstd;resolution:=optional,
com.ibm.security.krb5*;resolution:=optional,
sun.security.krb5;resolution:=optional,
+ io.grpc*;resolution:=optional,
*
</Import-Package>
<Private-Package>
@@ -115,6 +117,7 @@
net.jpountz*,
com.fasterxml.jackson*,
org.jose4j*,
+ com.google.common*,
kafka
</Private-Package>
<_dsannotations>*</_dsannotations>
diff --git
a/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java
b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java
index 414fd2d1..e31fd0e2 100644
---
a/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java
+++
b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java
@@ -19,10 +19,8 @@ package org.apache.karaf.decanter.appender.kafka;
import kafka.metrics.KafkaMetricsReporter;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServer;
-import org.apache.kafka.common.utils.SystemTime;
import org.junit.rules.ExternalResource;
import scala.Option;
-import scala.collection.mutable.Buffer;
import java.io.File;
import java.util.ArrayList;
@@ -71,7 +69,7 @@ public class EmbeddedKafkaBroker extends ExternalResource {
private KafkaServer startBroker(Properties props) {
List<KafkaMetricsReporter> kmrList = new ArrayList<>();
- KafkaServer server = new KafkaServer(new KafkaConfig(props), new
SystemTime(), Option.<String>empty(), true);
+ KafkaServer server = new KafkaServer(new KafkaConfig(props), new
TestSystemTime(), Option.<String>empty(), true);
server.startup();
return server;
}
diff --git
a/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/TestSystemTime.java
b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/TestSystemTime.java
new file mode 100644
index 00000000..8d807b8c
--- /dev/null
+++
b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/TestSystemTime.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.decanter.appender.kafka;
+
+import org.apache.kafka.common.errors.TimeoutException;
+import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.Utils;
+
+import java.util.function.Supplier;
+
+/**
+ * Copied from Apache Kafka (org.apache.kafka.common.utils.SystemTime)
+ */
+public class TestSystemTime implements Time {
+ private static final TestSystemTime SYSTEM_TIME = new TestSystemTime();
+
+ public static TestSystemTime getSystemTime() {
+ return SYSTEM_TIME;
+ }
+
+ public long milliseconds() {
+ return System.currentTimeMillis();
+ }
+
+ public long nanoseconds() {
+ return System.nanoTime();
+ }
+
+ public void sleep(long ms) {
+ Utils.sleep(ms);
+ }
+
+ public void waitObject(Object obj, Supplier<Boolean> condition, long
deadlineMs) throws InterruptedException {
+ synchronized(obj) {
+ while(!(Boolean)condition.get()) {
+ long currentTimeMs = this.milliseconds();
+ if (currentTimeMs >= deadlineMs) {
+ throw new TimeoutException("Condition not satisfied before
deadline");
+ }
+
+ obj.wait(deadlineMs - currentTimeMs);
+ }
+
+ }
+ }
+
+ public TestSystemTime() {
+ }
+}
diff --git a/collector/kafka/pom.xml b/collector/kafka/pom.xml
index a6700ebe..24fcfd78 100644
--- a/collector/kafka/pom.xml
+++ b/collector/kafka/pom.xml
@@ -87,10 +87,12 @@
!com.fasterxml.jackson*,
!net.jpountz*,
!org.jose4j*,
- !kafka;
+ !kafka,
+ !com.google.common*,
com.github.luben.zstd;resolution:=optional,
com.ibm.security.krb5*;resolution:=optional,
sun.security.krb5;resolution:=optional,
+ io.grpc*;resolution:=optional,
*
</Import-Package>
<Private-Package>
@@ -101,6 +103,7 @@
com.fasterxml.jackson*,
net.jpountz*,
org.jose4j*,
+ com.google.common*,
kafka
</Private-Package>
<_dsannotations>*</_dsannotations>
diff --git a/pom.xml b/pom.xml
index fcb5381b..b08ea5a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<cassandra.driver.version>4.17.0</cassandra.driver.version>
<glassfish-json.version>1.1.4</glassfish-json.version>
<json-api.version>1.1.4</json-api.version>
- <kafka.version>3.3.2</kafka.version>
+ <kafka.version>3.9.0</kafka.version>
<karaf.version>4.4.7</karaf.version>
<paho.version>1.2.5</paho.version>
<slf4j.version>1.7.36</slf4j.version>
