This is an automated email from the ASF dual-hosted git repository.
mjsax pushed a commit to branch 3.9
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.9 by this push:
new 6995e1e8025 HOTFIX: cleanup bad cherry-pick
6995e1e8025 is described below
commit 6995e1e8025942c234ee8ba6316e943a979edfde
Author: Matthias J. Sax <[email protected]>
AuthorDate: Mon Dec 16 10:01:32 2024 -0800
HOTFIX: cleanup bad cherry-pick
---
gradle/dependencies.gradle | 1 -
vagrant/base.sh | 23 -----------------------
2 files changed, 24 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 761c0d42a79..201dce3931f 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -137,7 +137,6 @@ versions += [
kafka_36: "3.6.2",
kafka_37: "3.7.2",
kafka_38: "3.8.1",
- log4j2: "2.24.1",
// When updating lz4 make sure the compression levels in
org.apache.kafka.common.record.CompressionType are still valid
lz4: "1.8.0",
mavenArtifact: "3.9.6",
diff --git a/vagrant/base.sh b/vagrant/base.sh
index 0d75ca8f667..553dbcde844 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -167,29 +167,6 @@ chmod a+rw /opt/kafka-3.7.2
get_kafka 3.8.1 2.12
chmod a+rw /opt/kafka-3.8.1
-# To ensure the Kafka cluster starts successfully under JDK 17, we need to
update the Zookeeper
-# client from version 3.4.x to 3.5.7 in Kafka versions 2.1.1, 2.2.2, and
2.3.1, as the older Zookeeper
-# client is incompatible with JDK 17. See KAFKA-17888 for more details.
-curl -s
"https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper/3.5.7/zookeeper-3.5.7.jar";
-o /opt/zookeeper-3.5.7.jar
-curl -s
"https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper-jute/3.5.7/zookeeper-jute-3.5.7.jar";
-o /opt/zookeeper-jute-3.5.7.jar
-rm -f /opt/kafka-2.1.1/libs/zookeeper-*
-rm -f /opt/kafka-2.2.2/libs/zookeeper-*
-rm -f /opt/kafka-2.3.1/libs/zookeeper-*
-
-cp /opt/zookeeper-3.5.7.jar /opt/kafka-2.1.1/libs/zookeeper-3.5.7.jar
-chmod a+rw /opt/kafka-2.1.1/libs/zookeeper-3.5.7.jar
-cp /opt/zookeeper-3.5.7.jar /opt/kafka-2.2.2/libs/zookeeper-3.5.7.jar
-chmod a+rw /opt/kafka-2.2.2/libs/zookeeper-3.5.7.jar
-cp /opt/zookeeper-3.5.7.jar /opt/kafka-2.3.1/libs/zookeeper-3.5.7.jar
-chmod a+rw /opt/kafka-2.3.1/libs/zookeeper-3.5.7.jar
-cp /opt/zookeeper-jute-3.5.7.jar /opt/kafka-2.1.1/libs/zookeeper-jute-3.5.7.jar
-chmod a+rw /opt/kafka-2.1.1/libs/zookeeper-jute-3.5.7.jar
-cp /opt/zookeeper-jute-3.5.7.jar /opt/kafka-2.2.2/libs/zookeeper-jute-3.5.7.jar
-chmod a+rw /opt/kafka-2.2.2/libs/zookeeper-jute-3.5.7.jar
-cp /opt/zookeeper-jute-3.5.7.jar /opt/kafka-2.3.1/libs/zookeeper-jute-3.5.7.jar
-chmod a+rw /opt/kafka-2.3.1/libs/zookeeper-jute-3.5.7.jar
->>>>>>> 8c55dcc979 (KAFKA-18237: Upgrade system tests from using 3.7.1 to
3.7.2 (#18180))
-
# For EC2 nodes, we want to use /mnt, which should have the local disk. On
local
# VMs, we can just create it if it doesn't exist and use it like we'd use
# /tmp. Eventually, we'd like to also support more directories, e.g. when EC2
