Skip to content

GH-3814: Upgrade Apache Kafka client dependencies to version 4.0.0 #3815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 24, 2025
Merged

GH-3814: Upgrade Apache Kafka client dependencies to version 4.0.0 #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6058f0d
GH-3814: Upgrade Apache Kafka client dependencies to version 4.0.0
sobychacko Feb 12, 2025
409b26b
Addressing PR review
sobychacko Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ext {
jaywayJsonPathVersion = '2.9.0'
junit4Version = '4.13.2'
junitJupiterVersion = '5.11.4'
kafkaVersion = '3.8.1'
kafkaVersion = '4.0.0'
kotlinCoroutinesVersion = '1.10.1'
log4jVersion = '2.24.3'
micrometerDocsVersion = '1.0.4'
Expand Down Expand Up @@ -355,16 +355,14 @@ project ('spring-kafka-test') {
description = 'Spring Kafka Test Support'

dependencies {
api "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
api 'org.springframework:spring-context'
api 'org.springframework:spring-test'
api "org.springframework.retry:spring-retry:$springRetryVersion"

api ("org.apache.zookeeper:zookeeper:$zookeeperVersion") {
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
exclude group: 'log4j'
}
api "org.apache.kafka:kafka-clients:$kafkaVersion:test"
api "org.apache.kafka:kafka-server:$kafkaVersion"
api "org.apache.kafka:kafka-test-common-runtime:$kafkaVersion"
api "org.apache.kafka:kafka-metadata:$kafkaVersion"
api "org.apache.kafka:kafka-server-common:$kafkaVersion"
api "org.apache.kafka:kafka-server-common:$kafkaVersion:test"
Expand Down
17 changes: 3 additions & 14 deletions ...g-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaBrokerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 the original author or authors.
* Copyright 2024-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -63,12 +63,8 @@ public static EmbeddedKafkaBroker create(EmbeddedKafka embeddedKafka, Function<S
.toArray(String[]::new);

EmbeddedKafkaBroker embeddedKafkaBroker;
if (embeddedKafka.kraft()) {
embeddedKafkaBroker = kraftBroker(embeddedKafka, topics);
}
else {
embeddedKafkaBroker = zkBroker(embeddedKafka, topics);
}
embeddedKafkaBroker = kraftBroker(embeddedKafka, topics);

int[] ports = setupPorts(embeddedKafka);

embeddedKafkaBroker.kafkaPorts(ports)
Expand Down Expand Up @@ -133,13 +129,6 @@ private static EmbeddedKafkaBroker kraftBroker(EmbeddedKafka embedded, String[]
return new EmbeddedKafkaKraftBroker(embedded.count(), embedded.partitions(), topics);
}

private static EmbeddedKafkaBroker zkBroker(EmbeddedKafka embedded, String[] topics) {
return new EmbeddedKafkaZKBroker(embedded.count(), embedded.controlledShutdown(), embedded.partitions(), topics)
.zkPort(embedded.zookeeperPort())
.zkConnectionTimeout(embedded.zkConnectionTimeout())
.zkSessionTimeout(embedded.zkSessionTimeout());
}

private EmbeddedKafkaBrokerFactory() {
}

Expand Down
4 changes: 2 additions & 2 deletions spring-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaKraftBroker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
import java.util.stream.Collectors;

import kafka.server.KafkaConfig;
import kafka.testkit.KafkaClusterTestKit;
import kafka.testkit.TestKitNodes;
import org.apache.commons.logging.LogFactory;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.admin.AdminClient;
Expand All @@ -53,6 +51,8 @@
import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.test.KafkaClusterTestKit;
import org.apache.kafka.common.test.TestKitNodes;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Utils;
import org.jspecify.annotations.Nullable;
Expand Down
Loading