Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions kafka/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ tar -czf /stackable/kafka-${NEW_VERSION}-src.tar.gz .
# We don't specify "-x test" to skip the tests, as we might bump some Kafka internal dependencies in the future and
# it's a good idea to run the tests in this case.
./gradlew clean releaseTarGz
./gradlew cyclonedxBom
#./gradlew cyclonedxBom
tar -xf core/build/distributions/kafka_${SCALA_VERSION}-${NEW_VERSION}.tgz -C /stackable
cp build/reports/bom.json /stackable/kafka_${SCALA_VERSION}-${NEW_VERSION}.cdx.json
#cp build/reports/bom.json /stackable/kafka_${SCALA_VERSION}-${NEW_VERSION}.cdx.json
rm -rf /stackable/kafka_${SCALA_VERSION}-${NEW_VERSION}/site-docs/
(cd .. && rm -rf ${PRODUCT_VERSION})

Expand Down Expand Up @@ -79,7 +79,7 @@ LABEL \
description="This image is deployed by the Stackable Operator for Apache Kafka."

COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
#COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/jmx/ /stackable/jmx/
COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat /stackable/bin/kcat-${KAFKA_KCAT_VERSION}
Expand Down
14 changes: 14 additions & 0 deletions kafka/boil-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,17 @@ java-devel = "24"
[versions."4.1.1".build-arguments]
scala-version = "2.13"
jmx-exporter-version = "1.3.0"

[versions."4.2.0".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
# to avoid major changes to the Kafka image build on short notice.
# Building this image is quick and in CI should not even be noticed.
"shared/reload4j" = "1.2.25"

[versions."4.2.0".build-arguments]
scala-version = "2.13"
jmx-exporter-version = "1.3.0"
65 changes: 65 additions & 0 deletions kafka/stackable/patches/4.2.0/0001-Add-CycloneDX-plugin.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
From 855ddc9cdffe2a838f9dc7d05064cf8b74144d36 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Wed, 13 May 2026 16:30:33 +0300
Subject: Add CycloneDX plugin

---
build.gradle | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2b27f3af75..6a5e74a2bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,8 +41,50 @@ plugins {
id 'org.scoverage' version '8.1' apply false
id 'com.gradleup.shadow' version '8.3.9' apply false
id 'com.diffplug.spotless' version "8.0.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-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',
+ 'upgrade-system-tests-38',
+ 'upgrade-system-tests-39',
+ 'upgrade-system-tests-40',
+ ]
}
-
+
ext {
minClientJavaVersion = 11
minNonClientJavaVersion = 17
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 456b4ec6e150ba3309d3fde426d2df80a67d85de Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Wed, 13 May 2026 16:31:44 +0300
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 6a5e74a2bd..2bdfb80d85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,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"

@@ -209,7 +211,9 @@ ext {
allprojects {

repositories {
- mavenCentral()
+ maven {
+ url 'https://build-repo.stackable.tech/repository/maven-public/'
+ }
}

dependencyUpdates {
Loading
Loading