Merge branch 'main' into chore/bump-trino-before-25.7.0

Author: NickLarsenNZ

CHANGELOG.md

@@ -50,6 +50,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])
 - spark-k8s: Add `3.5.6` ([#1142])
 - spark-connect-client: Add `3.5.6` ([#1142])
 - git-sync: Bump version to 4.4.1 ([#1151]).
@@ -174,6 +175,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
 [#1142]: https://github.com/stackabletech/docker-images/pull/1142
 [#1151]: https://github.com/stackabletech/docker-images/pull/1151
 [#1152]: https://github.com/stackabletech/docker-images/pull/1152

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 <[email protected]>
+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 {

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 <[email protected]>
+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 {

kafka/stackable/patches/3.9.1/patchable.toml

@@ -0,0 +1,2 @@
+base = "f745dfdcee2b9851204ddbbcd423626ab87294bc"
+mirror = "https://github.com/stackabletech/kafka.git"

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

spark-k8s/versions.py

@@ -30,7 +30,7 @@
         "jackson_dataformat_xml": "2.15.2",  # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.2
         "stax2_api": "4.2.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
         "woodstox_core": "6.5.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
-        "vector": "0.46.1",
+        "vector": "0.47.0",
         "jmx_exporter": "1.2.0",
         "tini": "0.19.0",
         "hbase_connector": "1.0.1",