This is an automated email from the ASF dual-hosted git repository. iwasakims pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/bigtop.git
commit a941906b8bda4e9f836389eaad3610f8a769aaa8 Author: Yu Hou <[email protected]> AuthorDate: Wed Sep 13 13:44:34 2023 +0800 BIGTOP-4005: Bump Kafka version to 2.8.2 (#1177) (cherry picked from commit a03006b5fee6d6da8f21e035c11391232f7f8e8b) --- .../kafka/patch1-PR11554-set-version-of-jgit.diff | 27 ---------------------- bigtop.bom | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/bigtop-packages/src/common/kafka/patch1-PR11554-set-version-of-jgit.diff b/bigtop-packages/src/common/kafka/patch1-PR11554-set-version-of-jgit.diff deleted file mode 100644 index dfe62ae7a..000000000 --- a/bigtop-packages/src/common/kafka/patch1-PR11554-set-version-of-jgit.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 54b93d1792..4330fed04f 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -37,6 +37,10 @@ buildscript { - classpath "com.diffplug.spotless:spotless-plugin-gradle:$versions.spotlessPlugin" - classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:$versions.spotbugsPlugin" - classpath "org.gradle:test-retry-gradle-plugin:$versions.testRetryPlugin" -+ // Override jgit dependency used by grgit and spotless as we appear to auto resolve to -+ // 5.13.0.202109080827-r and the latest version requires java 9. -+ // Requires force=true to be used in spotless as reported by ./gradlew buildEnvironment. -+ classpath("org.eclipse.jgit:org.eclipse.jgit:$versions.jgit") { force = true } - } - } - -diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle -index 43c297fb7a..d73e470eb1 100644 ---- a/gradle/dependencies.gradle -+++ b/gradle/dependencies.gradle -@@ -72,6 +72,7 @@ versions += [ - javassist: "3.27.0-GA", - jetty: "9.4.43.v20210629", - jersey: "2.34", -+ jgit: "5.12.0.202106070339-r", - jline: "3.12.1", - jmh: "1.27", - hamcrest: "2.2", diff --git a/bigtop.bom b/bigtop.bom index fa83c18ba..77e4b3782 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -303,7 +303,7 @@ bigtop { name = 'kafka' rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_") relNotes = 'Apache Kafka' - version { base = '2.8.1'; pkg = base; release = 3 } + version { base = '2.8.2'; pkg = base; release = 1 } tarball { destination = "$name-${version.base}.tar.gz" source = "$name-${version.base}-src.tgz" } url { download_path = "/$name/${version.base}/"
