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 bffe212b762 KAFKA-18237: Upgrade system tests from using 3.7.1 to
3.7.2 (#18180)
bffe212b762 is described below
commit bffe212b76247bab4d3613ffdd9eb75e9d4e7b26
Author: TengYao Chi <[email protected]>
AuthorDate: Tue Dec 17 01:49:03 2024 +0800
KAFKA-18237: Upgrade system tests from using 3.7.1 to 3.7.2 (#18180)
Reviewers: Matthias J. Sax <[email protected]>
---
gradle/dependencies.gradle | 5 +++--
tests/docker/Dockerfile | 8 ++++----
tests/kafkatest/version.py | 3 ++-
vagrant/base.sh | 31 +++++++++++++++++++++++++++----
4 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 94962ae7246..761c0d42a79 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -135,8 +135,9 @@ versions += [
kafka_34: "3.4.1",
kafka_35: "3.5.2",
kafka_36: "3.6.2",
- kafka_37: "3.7.1",
- kafka_38: "3.8.0",
+ 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/tests/docker/Dockerfile b/tests/docker/Dockerfile
index 57b71bf4fd0..be5a2363572 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -100,8 +100,8 @@ RUN mkdir -p "/opt/kafka-3.3.2" && chmod a+rw
/opt/kafka-3.3.2 && curl -s "$KAFK
RUN mkdir -p "/opt/kafka-3.4.1" && chmod a+rw /opt/kafka-3.4.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-3.4.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-3.4.1"
RUN mkdir -p "/opt/kafka-3.5.2" && chmod a+rw /opt/kafka-3.5.2 && curl -s
"$KAFKA_MIRROR/kafka_2.12-3.5.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-3.5.2"
RUN mkdir -p "/opt/kafka-3.6.2" && chmod a+rw /opt/kafka-3.6.2 && curl -s
"$KAFKA_MIRROR/kafka_2.12-3.6.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-3.6.2"
-RUN mkdir -p "/opt/kafka-3.7.1" && chmod a+rw /opt/kafka-3.7.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-3.7.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-3.7.1"
-RUN mkdir -p "/opt/kafka-3.8.0" && chmod a+rw /opt/kafka-3.8.0 && curl -s
"$KAFKA_MIRROR/kafka_2.12-3.8.0.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-3.8.0"
+RUN mkdir -p "/opt/kafka-3.7.2" && chmod a+rw /opt/kafka-3.7.2 && curl -s
"$KAFKA_MIRROR/kafka_2.12-3.7.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-3.7.2"
+RUN mkdir -p "/opt/kafka-3.8.1" && chmod a+rw /opt/kafka-3.8.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-3.8.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-3.8.1"
# Streams test dependencies
@@ -127,8 +127,8 @@ RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.3.2-test.jar" -o
/opt/kafka-3.3.2/lib
RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.4.1-test.jar" -o
/opt/kafka-3.4.1/libs/kafka-streams-3.4.1-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.5.2-test.jar" -o
/opt/kafka-3.5.2/libs/kafka-streams-3.5.2-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.6.2-test.jar" -o
/opt/kafka-3.6.2/libs/kafka-streams-3.6.2-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.7.1-test.jar" -o
/opt/kafka-3.7.1/libs/kafka-streams-3.7.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.8.0-test.jar" -o
/opt/kafka-3.8.0/libs/kafka-streams-3.8.0-test.jar
+RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.7.2-test.jar" -o
/opt/kafka-3.7.2/libs/kafka-streams-3.7.2-test.jar
+RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.8.1-test.jar" -o
/opt/kafka-3.8.1/libs/kafka-streams-3.8.1-test.jar
# The version of Kibosh to use for testing.
# If you update this, also update vagrant/base.sh
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 4825a460395..4ce32a0c598 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -269,7 +269,8 @@ LATEST_3_6 = V_3_6_2
# 3.7.x version
V_3_7_0 = KafkaVersion("3.7.0")
V_3_7_1 = KafkaVersion("3.7.1")
-LATEST_3_7 = V_3_7_1
+V_3_7_2 = KafkaVersion("3.7.2")
+LATEST_3_7 = V_3_7_2
# 3.8.x version
V_3_8_0 = KafkaVersion("3.8.0")
diff --git a/vagrant/base.sh b/vagrant/base.sh
index b896b610a05..0d75ca8f667 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -162,10 +162,33 @@ get_kafka 3.5.2 2.12
chmod a+rw /opt/kafka-3.5.2
get_kafka 3.6.2 2.12
chmod a+rw /opt/kafka-3.6.2
-get_kafka 3.7.1 2.12
-chmod a+rw /opt/kafka-3.7.1
-get_kafka 3.8.0 2.12
-chmod a+rw /opt/kafka-3.8.0
+get_kafka 3.7.2 2.12
+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
