From 52b6a4f9e4e35d3e0b503bf6c308bf677ad7f1dd Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Thu, 5 Jun 2025 16:44:15 +0200 Subject: [PATCH 1/3] chore: add kafka 3.9.1 --- .../3.9.1/0001-Add-CycloneDX-plugin.patch | 62 +++++++++++++++++++ ...e-Gradle-to-use-the-Nexus-Build-Repo.patch | 35 +++++++++++ kafka/stackable/patches/3.9.1/patchable.toml | 1 + kafka/versions.py | 9 +++ 4 files changed, 107 insertions(+) create mode 100644 kafka/stackable/patches/3.9.1/0001-Add-CycloneDX-plugin.patch create mode 100644 kafka/stackable/patches/3.9.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch create mode 100644 kafka/stackable/patches/3.9.1/patchable.toml diff --git a/kafka/stackable/patches/3.9.1/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/3.9.1/0001-Add-CycloneDX-plugin.patch new file mode 100644 index 000000000..1c090750d --- /dev/null +++ b/kafka/stackable/patches/3.9.1/0001-Add-CycloneDX-plugin.patch @@ -0,0 +1,62 @@ +From 9f5ef4ff9f1868244326a56ea7c22c5c7c21253c Mon Sep 17 00:00:00 2001 +From: Lukas Voetmand +Date: Thu, 17 Oct 2024 11:01:40 +0200 +Subject: Add CycloneDX plugin + +--- + build.gradle | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/build.gradle b/build.gradle +index 6b4725d542..f7894f379e 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -48,6 +48,48 @@ plugins { + // We are going to drop JDK8 support. Hence, the spotless is upgrade to newest version and be applied only if the build env is compatible with JDK 11. + // spotless 6.15.0+ has issue in runtime with JDK8 even through we define it with `apply:false`. see https://github.com/diffplug/spotless/issues/2156 for more details + id 'com.diffplug.spotless' version "6.14.0" apply false ++ id 'org.cyclonedx.bom' version '1.10.0' ++} ++ ++cyclonedxBom { ++ // Specified the type of project being built. Defaults to 'library' ++ projectType = "application" ++ // Specified the version of the CycloneDX specification to use. Defaults to '1.5' ++ schemaVersion = "1.5" ++ // Boms destination directory. Defaults to 'build/reports' ++ destination = file("build/reports") ++ // The file name for the generated BOMs (before the file format suffix). Defaults to 'bom' ++ outputName = "bom" ++ // The file format generated, can be xml, json or all for generating both. Defaults to 'all' ++ outputFormat = "json" ++ includeConfigs = ["runtimeClasspath"] ++ // Exclude test components. This list needs to be checked and, if it changed, updated for every new Kafka version. ++ // The list can be obtained by running `gradle projects | grep upgrade-system-tests` ++ skipProjects = [ ++ 'upgrade-system-tests-0100', ++ 'upgrade-system-tests-0101', ++ 'upgrade-system-tests-0102', ++ 'upgrade-system-tests-0110', ++ 'upgrade-system-tests-10', ++ 'upgrade-system-tests-11', ++ 'upgrade-system-tests-20', ++ 'upgrade-system-tests-21', ++ 'upgrade-system-tests-22', ++ 'upgrade-system-tests-23', ++ 'upgrade-system-tests-24', ++ 'upgrade-system-tests-25', ++ 'upgrade-system-tests-26', ++ 'upgrade-system-tests-27', ++ 'upgrade-system-tests-28', ++ 'upgrade-system-tests-30', ++ 'upgrade-system-tests-31', ++ 'upgrade-system-tests-32', ++ 'upgrade-system-tests-33', ++ 'upgrade-system-tests-34', ++ 'upgrade-system-tests-35', ++ 'upgrade-system-tests-36', ++ 'upgrade-system-tests-37' ++ ] + } + + ext { diff --git a/kafka/stackable/patches/3.9.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/3.9.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch new file mode 100644 index 000000000..4e48ddf55 --- /dev/null +++ b/kafka/stackable/patches/3.9.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch @@ -0,0 +1,35 @@ +From 4de60cd0100bffdd4b92133840ab25247187763d Mon Sep 17 00:00:00 2001 +From: Lars Francke +Date: Thu, 12 Dec 2024 10:09:47 +0100 +Subject: Change Gradle to use the Nexus Build Repo + +--- + build.gradle | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/build.gradle b/build.gradle +index f7894f379e..a176efd936 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets + + buildscript { + repositories { +- mavenCentral() ++ maven { ++ url 'https://build-repo.stackable.tech/repository/maven-public/' ++ } + } + apply from: "$rootDir/gradle/dependencies.gradle" + +@@ -168,7 +170,9 @@ ext { + allprojects { + + repositories { +- mavenCentral() ++ maven { ++ url 'https://build-repo.stackable.tech/repository/maven-public/' ++ } + } + + dependencyUpdates { diff --git a/kafka/stackable/patches/3.9.1/patchable.toml b/kafka/stackable/patches/3.9.1/patchable.toml new file mode 100644 index 000000000..debcc72b9 --- /dev/null +++ b/kafka/stackable/patches/3.9.1/patchable.toml @@ -0,0 +1 @@ +base = "f745dfdcee2b9851204ddbbcd423626ab87294bc" diff --git a/kafka/versions.py b/kafka/versions.py index 21cc8818f..0c7548290 100644 --- a/kafka/versions.py +++ b/kafka/versions.py @@ -17,6 +17,15 @@ "opa_authorizer": "1.5.1", "jmx_exporter": "1.2.0", }, + { + "product": "3.9.1", + "java-base": "21", + "java-devel": "21", + "scala": "2.13", + "kafka/kcat": "1.7.0", + "opa_authorizer": "1.5.1", + "jmx_exporter": "1.2.0", + }, { "product": "4.0.0", "java-base": "23", From 28dd0e848fe23eded0d60a35e9fcceee4cbe0736 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Thu, 5 Jun 2025 16:48:35 +0200 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32294a2a0..f21926cec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ All notable changes to this project will be documented in this file. - kafka: Add `4.0.0` ([#1117]) - Include `.tar.gz` snapshots of the product source code in container images ([#1126]) - airflow: OPA authorizer for Airflow 3.x ([#1127]) +- kafka: Add `3.9.1` ([#1149]) ### Changed @@ -163,6 +164,7 @@ All notable changes to this project will be documented in this file. [#1137]: https://github.com/stackabletech/docker-images/pull/1137 [#1138]: https://github.com/stackabletech/docker-images/pull/1138 [#1139]: https://github.com/stackabletech/docker-images/pull/1139 +[#1149]: https://github.com/stackabletech/docker-images/pull/1149 ## [25.3.0] - 2025-03-21 From 52a25d2807ea2c99cef40a90be57ee98820ab15b Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:46:05 +0200 Subject: [PATCH 3/3] add mirror config --- kafka/stackable/patches/3.9.1/patchable.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/kafka/stackable/patches/3.9.1/patchable.toml b/kafka/stackable/patches/3.9.1/patchable.toml index debcc72b9..57d034bfa 100644 --- a/kafka/stackable/patches/3.9.1/patchable.toml +++ b/kafka/stackable/patches/3.9.1/patchable.toml @@ -1 +1,2 @@ base = "f745dfdcee2b9851204ddbbcd423626ab87294bc" +mirror = "https://github.com/stackabletech/kafka.git"