diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e37de338..ad1bd5074 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file. - opensearch: Add `3.4.0` ([#1391]). - opensearch-dashboards: Add `3.4.0` ([#1392]). - testing-tools: build testing tools subimages in workflow ([#1366]). +- kafka: Add `4.1.1` ([#1395]). ### Changed @@ -30,6 +31,7 @@ All notable changes to this project will be documented in this file. - opensearch: Remove the `performance-analyzer` plugin from the OpenSearch image ([#1357]). - superset: Remove 4.0.2 and 4.1.2 ([#1394]). +- kafka: Remove `3.7.2` and `4.1.0` ([#1395]). - opa: remove 1.4.2 ([#1396]). ### Fixed @@ -56,6 +58,7 @@ All notable changes to this project will be documented in this file. [#1392]: https://github.com/stackabletech/docker-images/pull/1392 [#1393]: https://github.com/stackabletech/docker-images/pull/1393 [#1394]: https://github.com/stackabletech/docker-images/pull/1394 +[#1395]: https://github.com/stackabletech/docker-images/pull/1395 [#1396]: https://github.com/stackabletech/docker-images/pull/1396 ## [25.11.0] - 2025-11-07 diff --git a/kafka/boil-config.toml b/kafka/boil-config.toml index 8376e73f1..84848f5d1 100644 --- a/kafka/boil-config.toml +++ b/kafka/boil-config.toml @@ -1,14 +1,3 @@ -[versions."3.7.2".local-images] -java-base = "21" -java-devel = "21" -"kafka/kcat" = "1.7.0" -"kafka/kafka-opa-plugin" = "1.5.1" -"shared/reload4j" = "1.2.25" - -[versions."3.7.2".build-arguments] -scala-version = "2.13" -jmx-exporter-version = "1.3.0" - [versions."3.9.1".local-images] java-base = "21" java-devel = "21" @@ -20,9 +9,9 @@ java-devel = "21" scala-version = "2.13" jmx-exporter-version = "1.3.0" -[versions."4.1.0".local-images] -java-base = "23" -java-devel = "23" +[versions."4.1.1".local-images] +java-base = "24" +java-devel = "24" "kafka/kcat" = "1.7.0" "kafka/kafka-opa-plugin" = "1.5.1" # TODO: this is not used in this version but it's added @@ -30,6 +19,6 @@ java-devel = "23" # Building this image is quick and in CI should not even be noticed. "shared/reload4j" = "1.2.25" -[versions."4.1.0".build-arguments] +[versions."4.1.1".build-arguments] scala-version = "2.13" jmx-exporter-version = "1.3.0" diff --git a/kafka/stackable/patches/3.7.2/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/3.7.2/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 985e2fdfc..000000000 --- a/kafka/stackable/patches/3.7.2/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 629236f7f9eb4afc6fddceaeb27b4b1c48e13391 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 | 44 +++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 43 insertions(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 3a9914a9cd..398a7c994e 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 { -@@ -1015,7 +1057,7 @@ project(':core') { - testImplementation libs.junitJupiter - testImplementation libs.slf4jlog4j - testImplementation libs.caffeine -- -+ - generator project(':generator') - } - diff --git a/kafka/stackable/patches/3.7.2/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/3.7.2/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch deleted file mode 100644 index f8089ac11..000000000 --- a/kafka/stackable/patches/3.7.2/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1b71b13c3df17f9112b0f552e7be49c474b9dd40 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 398a7c994e..6fb5efe645 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" - -@@ -161,7 +163,9 @@ ext { - allprojects { - - repositories { -- mavenCentral() -+ maven { -+ url 'https://build-repo.stackable.tech/repository/maven-public/' -+ } - } - - dependencyUpdates { diff --git a/kafka/stackable/patches/3.7.2/0003-Build-custom-Stackable-version.patch b/kafka/stackable/patches/3.7.2/0003-Build-custom-Stackable-version.patch deleted file mode 100644 index d1b2e8241..000000000 --- a/kafka/stackable/patches/3.7.2/0003-Build-custom-Stackable-version.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 508c8053273b091b599c5ab9804cee877483703f Mon Sep 17 00:00:00 2001 -From: dervoeti -Date: Wed, 18 Jun 2025 12:15:17 +0200 -Subject: Build custom Stackable version - ---- - docs/js/templateData.js | 2 +- - gradle.properties | 2 +- - kafka-merge-pr.py | 2 +- - streams/quickstart/java/pom.xml | 2 +- - .../java/src/main/resources/archetype-resources/pom.xml | 2 +- - streams/quickstart/pom.xml | 2 +- - tests/kafkatest/__init__.py | 2 +- - tests/kafkatest/version.py | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/docs/js/templateData.js b/docs/js/templateData.js -index 7700e24003..8affa51e55 100644 ---- a/docs/js/templateData.js -+++ b/docs/js/templateData.js -@@ -19,6 +19,6 @@ limitations under the License. - var context={ - "version": "37", - "dotVersion": "3.7", -- "fullDotVersion": "3.7.2", -+ "fullDotVersion": "3.7.2-stackable0.0.0-dev", - "scalaVersion": "2.13" - }; -diff --git a/gradle.properties b/gradle.properties -index 08ae0ded1e..779dcfb829 100644 ---- a/gradle.properties -+++ b/gradle.properties -@@ -23,7 +23,7 @@ group=org.apache.kafka - # - streams/quickstart/pom.xml - # - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml - # - streams/quickstart/java/pom.xml --version=3.7.2 -+version=3.7.2-stackable0.0.0-dev - scalaVersion=2.13.12 - # Adding swaggerVersion in gradle.properties to have a single version in place for swagger - # New version of Swagger 2.2.14 requires minimum JDK 11. -diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py -index c16c811178..41b6794b8c 100755 ---- a/kafka-merge-pr.py -+++ b/kafka-merge-pr.py -@@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL" - - DEV_BRANCH_NAME = "trunk" - --DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.7.2-SNAPSHOT") -+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.7.2-stackable0.0.0-dev-SNAPSHOT") - - ORIGINAL_HEAD = "" - -diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml -index 1335f0d58b..e9e8cfe1ec 100644 ---- a/streams/quickstart/java/pom.xml -+++ b/streams/quickstart/java/pom.xml -@@ -26,7 +26,7 @@ - - org.apache.kafka - streams-quickstart -- 3.7.2 -+ 3.7.2-stackable0.0.0-dev - .. - - -diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml -index 445fab4b83..21cb230fc4 100644 ---- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml -+++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml -@@ -29,7 +29,7 @@ - - - UTF-8 -- 3.7.2 -+ 3.7.2-stackable0.0.0-dev - 1.7.36 - - -diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml -index 94ac32fcac..2cc1fcd600 100644 ---- a/streams/quickstart/pom.xml -+++ b/streams/quickstart/pom.xml -@@ -22,7 +22,7 @@ - org.apache.kafka - streams-quickstart - pom -- 3.7.2 -+ 3.7.2-stackable0.0.0-dev - - Kafka Streams :: Quickstart - -diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py -index 1c66c2bcfd..9274ce1fd0 100644 ---- a/tests/kafkatest/__init__.py -+++ b/tests/kafkatest/__init__.py -@@ -22,4 +22,4 @@ - # Instead, in development branches, the version should have a suffix of the form ".devN" - # - # For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0" --__version__ = '3.7.2' -+__version__ = '3.7.2-stackable0.0.0-dev' -diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py -index bed7cffac2..55dc3cbc7d 100644 ---- a/tests/kafkatest/version.py -+++ b/tests/kafkatest/version.py -@@ -122,7 +122,7 @@ def get_version(node=None): - return DEV_BRANCH - - DEV_BRANCH = KafkaVersion("dev") --DEV_VERSION = KafkaVersion("3.7.2-SNAPSHOT") -+DEV_VERSION = KafkaVersion("3.7.2-stackable0.0.0-dev") - - LATEST_METADATA_VERSION = "3.7" - diff --git a/kafka/stackable/patches/3.7.2/patchable.toml b/kafka/stackable/patches/3.7.2/patchable.toml deleted file mode 100644 index d1f02d916..000000000 --- a/kafka/stackable/patches/3.7.2/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "79a8f2b5f44f9d5a6867190d1dfc463d08d60b82" -mirror = "https://github.com/stackabletech/kafka.git" diff --git a/kafka/stackable/patches/4.1.0/0001-Add-CycloneDX-plugin.patch b/kafka/stackable/patches/4.1.1/0001-Add-CycloneDX-plugin.patch similarity index 97% rename from kafka/stackable/patches/4.1.0/0001-Add-CycloneDX-plugin.patch rename to kafka/stackable/patches/4.1.1/0001-Add-CycloneDX-plugin.patch index dce779ccc..3d5a99eaf 100644 --- a/kafka/stackable/patches/4.1.0/0001-Add-CycloneDX-plugin.patch +++ b/kafka/stackable/patches/4.1.1/0001-Add-CycloneDX-plugin.patch @@ -1,4 +1,4 @@ -From 670402877c002de8df0e3a8d67b735c326174cca Mon Sep 17 00:00:00 2001 +From c995ae95e5f725b19a7f4abdc28a86738aa59bf3 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 25 Sep 2025 10:47:57 +0200 Subject: Add CycloneDX plugin diff --git a/kafka/stackable/patches/4.1.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch b/kafka/stackable/patches/4.1.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch similarity index 92% rename from kafka/stackable/patches/4.1.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch rename to kafka/stackable/patches/4.1.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch index 9ca1552cc..953054478 100644 --- a/kafka/stackable/patches/4.1.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch +++ b/kafka/stackable/patches/4.1.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch @@ -1,4 +1,4 @@ -From 77163d8d3143358aa7cc71aaac8bc07029c90570 Mon Sep 17 00:00:00 2001 +From 69d2bc1b5d6ab5232fcd93307426bb254b139d6e Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 25 Sep 2025 10:50:07 +0200 Subject: Change Gradle to use the Nexus Build Repo diff --git a/kafka/stackable/patches/4.1.0/0003-Build-custom-Stackable-version.patch b/kafka/stackable/patches/4.1.1/0003-Build-custom-Stackable-version.patch similarity index 74% rename from kafka/stackable/patches/4.1.0/0003-Build-custom-Stackable-version.patch rename to kafka/stackable/patches/4.1.1/0003-Build-custom-Stackable-version.patch index dcc2e22a2..76699edfe 100644 --- a/kafka/stackable/patches/4.1.0/0003-Build-custom-Stackable-version.patch +++ b/kafka/stackable/patches/4.1.1/0003-Build-custom-Stackable-version.patch @@ -1,102 +1,103 @@ -From 1c9811ed87c0226cb11ce9dd54cfbc8b35357c3f Mon Sep 17 00:00:00 2001 -From: Malte Sander -Date: Thu, 25 Sep 2025 11:10:35 +0200 +From a9fbe72e176442b91376cb42b2f263589db57276 Mon Sep 17 00:00:00 2001 +From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> +Date: Wed, 14 Jan 2026 12:58:54 +0100 Subject: Build custom Stackable version --- - committer-tools/kafka-merge-pr.py | 2 +- - docs/js/templateData.js | 2 +- - gradle.properties | 2 +- - streams/quickstart/java/pom.xml | 2 +- - .../java/src/main/resources/archetype-resources/pom.xml | 2 +- - streams/quickstart/pom.xml | 2 +- - tests/kafkatest/__init__.py | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) + committer-tools/kafka-merge-pr.py | 2 +- + docs/js/templateData.js | 2 +- + gradle.properties | 2 +- + streams/quickstart/java/pom.xml | 2 +- + .../java/src/main/resources/archetype-resources/pom.xml | 2 +- + streams/quickstart/pom.xml | 3 ++- + tests/kafkatest/__init__.py | 2 +- + 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/committer-tools/kafka-merge-pr.py b/committer-tools/kafka-merge-pr.py -index d649181d74..e0ef9b73a3 100755 +index 1b181ed1d6..41fac8ba68 100755 --- a/committer-tools/kafka-merge-pr.py +++ b/committer-tools/kafka-merge-pr.py @@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL" DEV_BRANCH_NAME = "trunk" --DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "4.1.0") -+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "4.1.0-stackable0.0.0-dev") +-DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "4.1.1") ++DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "4.1.1-stackable0.0.0-dev") ORIGINAL_HEAD = "" diff --git a/docs/js/templateData.js b/docs/js/templateData.js -index cb834035f4..f7f1faf37d 100644 +index d63a81b503..5b3ded927b 100644 --- a/docs/js/templateData.js +++ b/docs/js/templateData.js @@ -19,6 +19,6 @@ limitations under the License. var context={ "version": "41", "dotVersion": "4.1", -- "fullDotVersion": "4.1.0", -+ "fullDotVersion": "4.1.0-stackable0.0.0-dev", +- "fullDotVersion": "4.1.1", ++ "fullDotVersion": "4.1.1-stackable0.0.0-dev", "scalaVersion": "2.13" }; diff --git a/gradle.properties b/gradle.properties -index 34e605f5a5..ab12d72c91 100644 +index 005a86fa63..295ae5bc1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ group=org.apache.kafka # - streams/quickstart/pom.xml # - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml # - streams/quickstart/java/pom.xml --version=4.1.0 -+version=4.1.0-stackable0.0.0-dev +-version=4.1.1 ++version=4.1.1-stackable0.0.0-dev scalaVersion=2.13.16 # Adding swaggerVersion in gradle.properties to have a single version in place for swagger swaggerVersion=2.2.25 diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml -index 2d85d3c6a6..a062e72217 100644 +index fc1aad5ee4..0335ea3760 100644 --- a/streams/quickstart/java/pom.xml +++ b/streams/quickstart/java/pom.xml @@ -26,7 +26,7 @@ org.apache.kafka streams-quickstart -- 4.1.0 -+ 4.1.0-stackable0.0.0-dev +- 4.1.1 ++ 4.1.1-stackable0.0.0-dev .. diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml -index b4b2ce160a..b820917c54 100644 +index 4cab1223a7..0688fa4ccb 100644 --- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml +++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,7 @@ UTF-8 -- 4.1.0 -+ 4.1.0-stackable0.0.0-dev +- 4.1.1 ++ 4.1.1-stackable0.0.0-dev 2.0.16 diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml -index b452399ae0..8d5fa3a603 100644 +index eef0727480..845281cce9 100644 --- a/streams/quickstart/pom.xml +++ b/streams/quickstart/pom.xml -@@ -22,7 +22,7 @@ +@@ -22,7 +22,8 @@ org.apache.kafka streams-quickstart pom -- 4.1.0 -+ 4.1.0-stackable0.0.0-dev +- 4.1.1 ++ 4.1.1-stackable0.0.0-dev ++ Kafka Streams :: Quickstart diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py -index dd8e97fa30..488b5d20dc 100644 +index 9484aec27d..213f9eb9aa 100644 --- a/tests/kafkatest/__init__.py +++ b/tests/kafkatest/__init__.py @@ -22,4 +22,4 @@ # Instead, in development branches, the version should have a suffix of the form ".devN" # # For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0" --__version__ = '4.1.0' -+__version__ = '4.1.0-stackable0.0.0-dev' +-__version__ = '4.1.1' ++__version__ = '4.1.1-stackable0.0.0-dev' diff --git a/kafka/stackable/patches/4.1.0/0004-Include-jackson-dataformat-xml-dependency.patch b/kafka/stackable/patches/4.1.1/0004-Include-jackson-dataformat-xml-dependency.patch similarity index 98% rename from kafka/stackable/patches/4.1.0/0004-Include-jackson-dataformat-xml-dependency.patch rename to kafka/stackable/patches/4.1.1/0004-Include-jackson-dataformat-xml-dependency.patch index 7756c4272..134792a1d 100644 --- a/kafka/stackable/patches/4.1.0/0004-Include-jackson-dataformat-xml-dependency.patch +++ b/kafka/stackable/patches/4.1.1/0004-Include-jackson-dataformat-xml-dependency.patch @@ -1,4 +1,4 @@ -From f35a5e1087d0efeefbdf7c9a44a436e2e9f7429d Mon Sep 17 00:00:00 2001 +From e908b273dc6844f5cd4e6af5bc16622674457d9d Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 25 Sep 2025 11:13:20 +0200 Subject: Include jackson dataformat xml dependency diff --git a/kafka/stackable/patches/4.1.0/patchable.toml b/kafka/stackable/patches/4.1.1/patchable.toml similarity index 51% rename from kafka/stackable/patches/4.1.0/patchable.toml rename to kafka/stackable/patches/4.1.1/patchable.toml index e8a1434df..939faf85a 100644 --- a/kafka/stackable/patches/4.1.0/patchable.toml +++ b/kafka/stackable/patches/4.1.1/patchable.toml @@ -1,2 +1,2 @@ -base = "13f70256db3c994c590e5d262a7cc50b9e973204" +base = "be816b82d25370ceac697ccf7c88cea873e9b4e3" mirror = "https://github.com/stackabletech/kafka.git"