Merge branch 'main' into feat/airflow-3

Author: adwk67

CHANGELOG.md

@@ -45,6 +45,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
 
@@ -95,6 +96,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
@@ -134,6 +136,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
 [#1122]: https://github.com/stackabletech/docker-images/pull/1122

kafka/stackable/patches/3.7.1/patchable.toml

@@ -1,20 +1,20 @@
-From 55bcff9a298c339bd7eb10cdd733e600f671861b Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <[email protected]>
-Date: Thu, 17 Oct 2024 11:01:40 +0200
+From 5adf2efcf9f91e66aea16cbbf49e0a9c059b2be9 Mon Sep 17 00:00:00 2001
+From: Razvan-Daniel Mihai <[email protected]>
+Date: Thu, 15 May 2025 18:15:16 +0200
 Subject: Add CycloneDX plugin
 
 ---
  build.gradle | 41 +++++++++++++++++++++++++++++++++++++++++
  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',
 +    ]
  }
 

kafka/stackable/patches/3.8.0/0001-Add-CycloneDX-plugin.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 <[email protected]>
 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 {

kafka/stackable/patches/3.8.0/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch

@@ -1,2 +1,2 @@
-base = "771b9576b00ecf5b64ab6e8bedf04156fbdb5cd6"
+base = "985bc99521dd22bbf620591b8db8613c54f596b2"
 mirror = "https://github.com/stackabletech/kafka.git"

kafka/stackable/patches/3.7.1/0001-Add-CycloneDX-plugin.patch renamed to kafka/stackable/patches/4.0.0/0001-Add-CycloneDX-plugin.patch

@@ -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",