This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 6191376a9 BIGTOP-4278. Upgrade Kafka to 3.4.1. (#1310)
6191376a9 is described below
commit 6191376a9e5a5ce358c478827f636bf7f2828f71
Author: Kengo Seki <[email protected]>
AuthorDate: Mon Dec 2 00:15:18 2024 +0900
BIGTOP-4278. Upgrade Kafka to 3.4.1. (#1310)
---
.../src/common/kafka/do-component-build | 2 +-
.../src/common/kafka/patch0-KAFKA-12293-2.8.1.diff | 46 ----------------------
.../src/common/kafka/patch0-KAFKA-14661.diff | 15 +++++++
.../smoke-tests/kafka/TestKafkaSmoke.groovy | 6 +--
bigtop.bom | 4 +-
5 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/bigtop-packages/src/common/kafka/do-component-build
b/bigtop-packages/src/common/kafka/do-component-build
index e8c461871..606ca4833 100644
--- a/bigtop-packages/src/common/kafka/do-component-build
+++ b/bigtop-packages/src/common/kafka/do-component-build
@@ -36,7 +36,7 @@ export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m"
# Rewrite the zookeeper version defined in gradle/dependencies.gradle directly
# with $ZOOKEEPER_VERSION, because we can't override it via command line
option.
sed -i -e 's/zookeeper: *"\([0-9]\{1,\}\.\)*[0-9]\{1,\}"/zookeeper:
"'${ZOOKEEPER_VERSION}'"/' gradle/dependencies.gradle
-./gradlew -PscalaVersion=${SCALA_VERSION} clean releaseTarGz -x signArchives
+./gradlew -PscalaVersion=${SCALA_VERSION} clean releaseTarGz
rm -rf build
mkdir build
diff --git a/bigtop-packages/src/common/kafka/patch0-KAFKA-12293-2.8.1.diff
b/bigtop-packages/src/common/kafka/patch0-KAFKA-12293-2.8.1.diff
deleted file mode 100644
index 10db19007..000000000
--- a/bigtop-packages/src/common/kafka/patch0-KAFKA-12293-2.8.1.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/build.gradle b/build.gradle
-index e21609fd49..a187004b69 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -20,12 +20,10 @@ import java.nio.charset.StandardCharsets
- buildscript {
- repositories {
- mavenCentral()
-- jcenter()
- maven {
- url "https://plugins.gradle.org/m2/";
- }
- }
-- apply from: file('gradle/buildscript.gradle'), to: buildscript
- apply from: "$rootDir/gradle/dependencies.gradle"
-
- dependencies {
-diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle
-deleted file mode 100644
-index 83967bb47d..0000000000
---- a/gradle/buildscript.gradle
-+++ /dev/null
-@@ -1,23 +0,0 @@
--// 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.
--
--repositories {
-- repositories {
-- // For license plugin.
-- maven {
-- url 'https://dl.bintray.com/content/netflixoss/external-gradle-plugins/'
-- }
-- }
--}
diff --git a/bigtop-packages/src/common/kafka/patch0-KAFKA-14661.diff
b/bigtop-packages/src/common/kafka/patch0-KAFKA-14661.diff
new file mode 100644
index 000000000..df3ef8c22
--- /dev/null
+++ b/bigtop-packages/src/common/kafka/patch0-KAFKA-14661.diff
@@ -0,0 +1,15 @@
+diff --git a/build.gradle b/build.gradle
+index 11e163684355..76dec6966800 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -893,6 +893,10 @@ project(':core') {
+ implementation libs.dropwizardMetrics
+ exclude module: 'slf4j-log4j12'
+ exclude module: 'log4j'
++ // Both Kafka and Zookeeper use slf4j. ZooKeeper moved from log4j to
logback in v3.8.0, but Kafka relies on reload4j.
++ // We are removing Zookeeper's dependency on logback so we have a
singular logging backend.
++ exclude module: 'logback-classic'
++ exclude module: 'logback-core'
+ }
+ // ZooKeeperMain depends on commons-cli but declares the dependency as
`provided`
+ implementation libs.commonsCli
diff --git a/bigtop-tests/smoke-tests/kafka/TestKafkaSmoke.groovy
b/bigtop-tests/smoke-tests/kafka/TestKafkaSmoke.groovy
index b36503df2..44bab097f 100644
--- a/bigtop-tests/smoke-tests/kafka/TestKafkaSmoke.groovy
+++ b/bigtop-tests/smoke-tests/kafka/TestKafkaSmoke.groovy
@@ -44,7 +44,7 @@ class TestKafkaSmoke {
@AfterClass
public static void deleteKafkaTopics() {
sh.exec(KAFKA_TOPICS
- + " --zookeeper localhost:2181"
+ + " --bootstrap-server localhost:9092"
+ " --delete --topic test"
);
assertTrue("Delete Kafka topics failed. ", sh.getRet() == 0);
@@ -52,8 +52,8 @@ class TestKafkaSmoke {
@Test
public void test0CreateTopics() {
- sh.exec(KAFKA_TOPICS + " --create --zookeeper localhost:2181
--replication-factor 1 --partitions 1 --topic test");
- sh.exec(KAFKA_TOPICS + " --list --zookeeper localhost:2181");
+ sh.exec(KAFKA_TOPICS + " --create --bootstrap-server localhost:9092
--replication-factor 1 --partitions 1 --topic test");
+ sh.exec(KAFKA_TOPICS + " --list --bootstrap-server localhost:9092");
assertTrue(" Create Kafka topics failed. " + sh.getOut() + " " +
sh.getErr(), sh.getRet() == 0);
}
diff --git a/bigtop.bom b/bigtop.bom
index 97fa14187..f7b44fe78 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -101,7 +101,7 @@ bigtop {
base_version = version.takeWhile { it != '-' }
stack {
'jdk' { version = "1." + ( System.getenv('BIGTOP_JDK') ?: "8" );
version_base = version }
- 'scala' { version = '2.12.13'; version_base = version }
+ 'scala' { version = '2.12.20'; version_base = version }
}
apache {
APACHE_MIRROR = "https://apache.osuosl.org";
@@ -304,7 +304,7 @@ bigtop {
name = 'kafka'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache Kafka'
- version { base = '2.8.2'; pkg = base; release = 1 }
+ version { base = '3.4.1'; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}.tar.gz"
source = "$name-${version.base}-src.tgz" }
url { download_path = "/$name/${version.base}/"
