Skip to content
Merged
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
- nifi: Backport NIFI-14848 to NiFi ([#1225]).
- stackable-base: Add cert-tools ([#1247]).
- kafka: Add jackson xml dataformat for Kafka 4.0.0 ([#1262]).
- kafka: Add version `4.1.0` ([#1277]).

### Changed

Expand All @@ -27,7 +28,8 @@ All notable changes to this project will be documented in this file.

### Removed

- opensearch: stop applying formatting plugin ([#1230]).
- opensearch: Stop applying formatting plugin ([#1230]).
- kafka: Remove version `4.0.0` ([#1277]).

[#1207]: https://github.com/stackabletech/docker-images/pull/1207
[#1215]: https://github.com/stackabletech/docker-images/pull/1215
Expand All @@ -43,6 +45,7 @@ All notable changes to this project will be documented in this file.
[#1258]: https://github.com/stackabletech/docker-images/pull/1258
[#1262]: https://github.com/stackabletech/docker-images/pull/1262
[#1264]: https://github.com/stackabletech/docker-images/pull/1264
[#1277]: https://github.com/stackabletech/docker-images/pull/1277

## [25.7.0] - 2025-07-23

Expand Down
4 changes: 2 additions & 2 deletions kafka/boil-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ java-devel = "21"
scala-version = "2.13"
jmx-exporter-version = "1.3.0"

[versions."4.0.0".local-images]
[versions."4.1.0".local-images]
java-base = "23"
java-devel = "23"
"kafka/kcat" = "1.7.0"
"kafka/kafka-opa-plugin" = "1.5.1"

[versions."4.0.0".build-arguments]
[versions."4.1.0".build-arguments]
scala-version = "2.13"
jmx-exporter-version = "1.3.0"

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
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
From 670402877c002de8df0e3a8d67b735c326174cca Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Thu, 25 Sep 2025 10:47:57 +0200
Subject: Add CycloneDX plugin

---
build.gradle | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)

diff --git a/build.gradle b/build.gradle
index 388a85aa85..fb0015e49a 100644
index 97250637b7..732c6c2a18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
@@ -41,6 +41,47 @@ plugins {
id 'org.scoverage' version '8.0.3' apply false
id 'com.gradleup.shadow' version '8.3.6' apply false
id 'com.diffplug.spotless' version "6.25.0"
+ id 'org.cyclonedx.bom' version '1.10.0'
+}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From a91d18e7227aea84fb0baaafc8d253d321a46a0b Mon Sep 17 00:00:00 2001
From: Lars Francke <git@lars-francke.de>
Date: Thu, 12 Dec 2024 10:09:47 +0100
From 77163d8d3143358aa7cc71aaac8bc07029c90570 Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Thu, 25 Sep 2025 10:50:07 +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 fb0015e49a..7497ce70a3 100644
index 732c6c2a18..e6c0449952 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets
@@ -18,7 +18,9 @@ import java.nio.charset.StandardCharsets

buildscript {
repositories {
Expand All @@ -22,7 +22,7 @@ index fb0015e49a..7497ce70a3 100644
}
apply from: "$rootDir/gradle/dependencies.gradle"

@@ -208,7 +210,9 @@ ext {
@@ -204,7 +206,9 @@ ext {
allprojects {

repositories {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
From 1c9811ed87c0226cb11ce9dd54cfbc8b35357c3f Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Thu, 25 Sep 2025 11:10:35 +0200
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(-)

diff --git a/committer-tools/kafka-merge-pr.py b/committer-tools/kafka-merge-pr.py
index d649181d74..e0ef9b73a3 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")

ORIGINAL_HEAD = ""

diff --git a/docs/js/templateData.js b/docs/js/templateData.js
index cb834035f4..f7f1faf37d 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",
"scalaVersion": "2.13"
};
diff --git a/gradle.properties b/gradle.properties
index 34e605f5a5..ab12d72c91 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
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
--- a/streams/quickstart/java/pom.xml
+++ b/streams/quickstart/java/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kafka</groupId>
<artifactId>streams-quickstart</artifactId>
- <version>4.1.0</version>
+ <version>4.1.0-stackable0.0.0-dev</version>
<relativePath>..</relativePath>
</parent>

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

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <kafka.version>4.1.0</kafka.version>
+ <kafka.version>4.1.0-stackable0.0.0-dev</kafka.version>
<slf4j.version>2.0.16</slf4j.version>
</properties>

diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml
index b452399ae0..8d5fa3a603 100644
--- a/streams/quickstart/pom.xml
+++ b/streams/quickstart/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.kafka</groupId>
<artifactId>streams-quickstart</artifactId>
<packaging>pom</packaging>
- <version>4.1.0</version>
+ <version>4.1.0-stackable0.0.0-dev</version>

<name>Kafka Streams :: Quickstart</name>

diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index dd8e97fa30..488b5d20dc 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'
Loading