diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a11588c3..180c3050d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ All notable changes to this project will be documented in this file. - ci: Add golang image to mirror workflow ([#1103]). - omid: bump version to 1.1.3 ([#1105]) - hbase: add 2.6.2 and upgrade dependencies ([#1101]) +- kafka: Add `4.0.0` ([#1117]) ### Changed @@ -94,6 +95,7 @@ All notable changes to this project will be documented in this file. - hbase: Remove 2.4.18 ([#1101]) - druid: Remove `30.0.0` ([#1110]). - nifi: Remove `2.2.0` ([#1114]). +- kafka: Remove `3.7.1` and `3.8.0` ([#1117]) [nifi-iceberg-bundle]: https://github.com/stackabletech/nifi-iceberg-bundle [#1025]: https://github.com/stackabletech/docker-images/pull/1025 @@ -133,6 +135,7 @@ All notable changes to this project will be documented in this file. [#1110]: https://github.com/stackabletech/docker-images/pull/1110 [#1114]: https://github.com/stackabletech/docker-images/pull/1114 [#1116]: https://github.com/stackabletech/docker-images/pull/1116 +[#1117]: https://github.com/stackabletech/docker-images/pull/1117 [#1119]: https://github.com/stackabletech/docker-images/pull/1119 [#1121]: https://github.com/stackabletech/docker-images/pull/1121 diff --git a/kafka/stackable/patches/3.7.1/patchable.toml b/kafka/stackable/patches/3.7.1/patchable.toml deleted file mode 100644 index 742bc6db8..000000000 --- a/kafka/stackable/patches/3.7.1/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "e2494e6ffb89f8288ed2aeb9b5596c755210bffd" -mirror = "https://github.com/stackabletech/kafka.git" diff --git a/kafka/stackable/patches/3.8.0/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/3.8.0/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 588cfe3ba..000000000 --- a/kafka/stackable/patches/3.8.0/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9bc39c677cb825c4ddae900005e41420bb63a48c Mon Sep 17 00:00:00 2001 -From: dervoeti -Date: Thu, 24 Apr 2025 17:24:47 +0200 -Subject: Add CycloneDX plugin - ---- - build.gradle | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - -diff --git a/build.gradle b/build.gradle -index 92082fe7cf..e3d6c722b6 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -48,6 +48,48 @@ plugins { - // artifacts - see https://github.com/johnrengelman/shadow/issues/901 - id 'com.github.johnrengelman.shadow' version '8.1.0' apply false - id 'com.diffplug.spotless' version '6.14.0' apply false // 6.14.1 and newer require Java 11 at compile time, so we can't upgrade until AK 4.0 -+ 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.8.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/3.8.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch deleted file mode 100644 index 3f8fe00ea..000000000 --- a/kafka/stackable/patches/3.8.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5cead6a5c6cc28dbfbb2cd4088d9598989287feb Mon Sep 17 00:00:00 2001 -From: dervoeti -Date: Thu, 24 Apr 2025 17:25:17 +0200 -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 e3d6c722b6..8eec9a4a96 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.7.1/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/4.0.0/0001-Add-CycloneDX-plugin.patch similarity index 78% rename from kafka/stackable/patches/3.7.1/0001-Add-CycloneDX-plugin.patch rename to kafka/stackable/patches/4.0.0/0001-Add-CycloneDX-plugin.patch index 4eaaac32f..d6a7d1981 100644 --- a/kafka/stackable/patches/3.7.1/0001-Add-CycloneDX-plugin.patch +++ b/kafka/stackable/patches/4.0.0/0001-Add-CycloneDX-plugin.patch @@ -1,6 +1,6 @@ -From 55bcff9a298c339bd7eb10cdd733e600f671861b Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Thu, 17 Oct 2024 11:01:40 +0200 +From 5adf2efcf9f91e66aea16cbbf49e0a9c059b2be9 Mon Sep 17 00:00:00 2001 +From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> +Date: Thu, 15 May 2025 18:15:16 +0200 Subject: Add CycloneDX plugin --- @@ -8,13 +8,13 @@ Subject: Add CycloneDX plugin 1 file changed, 41 insertions(+) diff --git a/build.gradle b/build.gradle -index 32e6e8fdca..13a0deffec 100644 +index 388a85aa85..fb0015e49a 100644 --- a/build.gradle +++ b/build.gradle -@@ -48,6 +48,47 @@ plugins { +@@ -45,6 +45,47 @@ plugins { // artifacts - see https://github.com/johnrengelman/shadow/issues/901 id 'com.github.johnrengelman.shadow' version '8.1.0' apply false - id 'com.diffplug.spotless' version '6.14.0' apply false // 6.14.1 and newer require Java 11 at compile time, so we can't upgrade until AK 4.0 + id 'com.diffplug.spotless' version "6.25.0" + id 'org.cyclonedx.bom' version '1.10.0' +} + @@ -33,9 +33,6 @@ index 32e6e8fdca..13a0deffec 100644 + // 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', @@ -54,7 +51,10 @@ index 32e6e8fdca..13a0deffec 100644 + 'upgrade-system-tests-33', + 'upgrade-system-tests-34', + 'upgrade-system-tests-35', -+ 'upgrade-system-tests-36' ++ 'upgrade-system-tests-36', ++ 'upgrade-system-tests-37', ++ 'upgrade-system-tests-38', ++ 'upgrade-system-tests-39', + ] } diff --git a/kafka/stackable/patches/3.7.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/4.0.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch similarity index 85% rename from kafka/stackable/patches/3.7.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch rename to kafka/stackable/patches/4.0.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch index 50db37e2b..f80fde5c5 100644 --- a/kafka/stackable/patches/3.7.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch +++ b/kafka/stackable/patches/4.0.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch @@ -1,4 +1,4 @@ -From 06c6dd7309cc6f2a75089bf91124cff88beed776 Mon Sep 17 00:00:00 2001 +From a91d18e7227aea84fb0baaafc8d253d321a46a0b 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 @@ -8,7 +8,7 @@ Subject: Change Gradle to use the Nexus Build Repo 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle -index 13a0deffec..abb465f890 100644 +index fb0015e49a..7497ce70a3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets @@ -22,7 +22,7 @@ index 13a0deffec..abb465f890 100644 } apply from: "$rootDir/gradle/dependencies.gradle" -@@ -160,7 +162,9 @@ ext { +@@ -208,7 +210,9 @@ ext { allprojects { repositories { diff --git a/kafka/stackable/patches/3.8.0/patchable.toml b/kafka/stackable/patches/4.0.0/patchable.toml similarity index 51% rename from kafka/stackable/patches/3.8.0/patchable.toml rename to kafka/stackable/patches/4.0.0/patchable.toml index 80b106d44..ce3999d4a 100644 --- a/kafka/stackable/patches/3.8.0/patchable.toml +++ b/kafka/stackable/patches/4.0.0/patchable.toml @@ -1,2 +1,2 @@ -base = "771b9576b00ecf5b64ab6e8bedf04156fbdb5cd6" +base = "985bc99521dd22bbf620591b8db8613c54f596b2" mirror = "https://github.com/stackabletech/kafka.git" diff --git a/kafka/versions.py b/kafka/versions.py index 47bb50d94..21cc8818f 100644 --- a/kafka/versions.py +++ b/kafka/versions.py @@ -1,13 +1,4 @@ versions = [ - { - "product": "3.7.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": "3.7.2", "java-base": "21", @@ -18,7 +9,7 @@ "jmx_exporter": "1.2.0", }, { - "product": "3.8.0", + "product": "3.9.0", "java-base": "21", "java-devel": "21", "scala": "2.13", @@ -27,9 +18,9 @@ "jmx_exporter": "1.2.0", }, { - "product": "3.9.0", - "java-base": "21", - "java-devel": "21", + "product": "4.0.0", + "java-base": "23", + "java-devel": "23", "scala": "2.13", "kafka/kcat": "1.7.0", "opa_authorizer": "1.5.1",