Skip to content

Commit 8366ad3

Browse files
authored
chore(kafka): Replace 4.0.0 with 4.1.0 (#1277)
* replace kafka 4.0.0 with 4.1.0 * adapted changelog * clarify 4.0.0 version replacement in changelog
1 parent 072ed80 commit 8366ad3

8 files changed

+145
-185
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
1414
- nifi: Backport NIFI-14848 to NiFi ([#1225]).
1515
- stackable-base: Add cert-tools ([#1247]).
1616
- kafka: Add jackson xml dataformat for Kafka 4.0.0 ([#1262]).
17+
- kafka: Add version `4.1.0` ([#1277]).
1718

1819
### Changed
1920

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

2829
### Removed
2930

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

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

4750
## [25.7.0] - 2025-07-23
4851

kafka/boil-config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ java-devel = "21"
2828
scala-version = "2.13"
2929
jmx-exporter-version = "1.3.0"
3030

31-
[versions."4.0.0".local-images]
31+
[versions."4.1.0".local-images]
3232
java-base = "23"
3333
java-devel = "23"
3434
"kafka/kcat" = "1.7.0"
3535
"kafka/kafka-opa-plugin" = "1.5.1"
3636

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

kafka/stackable/patches/4.0.0/0003-Build-custom-Stackable-version.patch

Lines changed: 0 additions & 147 deletions
This file was deleted.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
From 5adf2efcf9f91e66aea16cbbf49e0a9c059b2be9 Mon Sep 17 00:00:00 2001
2-
From: Razvan-Daniel Mihai <[email protected].com>
3-
Date: Thu, 15 May 2025 18:15:16 +0200
1+
From 670402877c002de8df0e3a8d67b735c326174cca Mon Sep 17 00:00:00 2001
2+
From: Malte Sander <malte.sander.it@gmail.com>
3+
Date: Thu, 25 Sep 2025 10:47:57 +0200
44
Subject: Add CycloneDX plugin
55

66
---
77
build.gradle | 41 +++++++++++++++++++++++++++++++++++++++++
88
1 file changed, 41 insertions(+)
99

1010
diff --git a/build.gradle b/build.gradle
11-
index 388a85aa85..fb0015e49a 100644
11+
index 97250637b7..732c6c2a18 100644
1212
--- a/build.gradle
1313
+++ b/build.gradle
14-
@@ -45,6 +45,47 @@ plugins {
15-
// artifacts - see https://github.com/johnrengelman/shadow/issues/901
16-
id 'com.github.johnrengelman.shadow' version '8.1.0' apply false
14+
@@ -41,6 +41,47 @@ plugins {
15+
id 'org.scoverage' version '8.0.3' apply false
16+
id 'com.gradleup.shadow' version '8.3.6' apply false
1717
id 'com.diffplug.spotless' version "6.25.0"
1818
+ id 'org.cyclonedx.bom' version '1.10.0'
1919
+}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From a91d18e7227aea84fb0baaafc8d253d321a46a0b Mon Sep 17 00:00:00 2001
2-
From: Lars Francke <[email protected]>
3-
Date: Thu, 12 Dec 2024 10:09:47 +0100
1+
From 77163d8d3143358aa7cc71aaac8bc07029c90570 Mon Sep 17 00:00:00 2001
2+
From: Malte Sander <[email protected]>
3+
Date: Thu, 25 Sep 2025 10:50:07 +0200
44
Subject: Change Gradle to use the Nexus Build Repo
55

66
---
77
build.gradle | 8 ++++++--
88
1 file changed, 6 insertions(+), 2 deletions(-)
99

1010
diff --git a/build.gradle b/build.gradle
11-
index fb0015e49a..7497ce70a3 100644
11+
index 732c6c2a18..e6c0449952 100644
1212
--- a/build.gradle
1313
+++ b/build.gradle
14-
@@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets
14+
@@ -18,7 +18,9 @@ import java.nio.charset.StandardCharsets
1515

1616
buildscript {
1717
repositories {
@@ -22,7 +22,7 @@ index fb0015e49a..7497ce70a3 100644
2222
}
2323
apply from: "$rootDir/gradle/dependencies.gradle"
2424

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

2828
repositories {
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
From 1c9811ed87c0226cb11ce9dd54cfbc8b35357c3f Mon Sep 17 00:00:00 2001
2+
From: Malte Sander <[email protected]>
3+
Date: Thu, 25 Sep 2025 11:10:35 +0200
4+
Subject: Build custom Stackable version
5+
6+
---
7+
committer-tools/kafka-merge-pr.py | 2 +-
8+
docs/js/templateData.js | 2 +-
9+
gradle.properties | 2 +-
10+
streams/quickstart/java/pom.xml | 2 +-
11+
.../java/src/main/resources/archetype-resources/pom.xml | 2 +-
12+
streams/quickstart/pom.xml | 2 +-
13+
tests/kafkatest/__init__.py | 2 +-
14+
7 files changed, 7 insertions(+), 7 deletions(-)
15+
16+
diff --git a/committer-tools/kafka-merge-pr.py b/committer-tools/kafka-merge-pr.py
17+
index d649181d74..e0ef9b73a3 100755
18+
--- a/committer-tools/kafka-merge-pr.py
19+
+++ b/committer-tools/kafka-merge-pr.py
20+
@@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL"
21+
22+
DEV_BRANCH_NAME = "trunk"
23+
24+
-DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "4.1.0")
25+
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "4.1.0-stackable0.0.0-dev")
26+
27+
ORIGINAL_HEAD = ""
28+
29+
diff --git a/docs/js/templateData.js b/docs/js/templateData.js
30+
index cb834035f4..f7f1faf37d 100644
31+
--- a/docs/js/templateData.js
32+
+++ b/docs/js/templateData.js
33+
@@ -19,6 +19,6 @@ limitations under the License.
34+
var context={
35+
"version": "41",
36+
"dotVersion": "4.1",
37+
- "fullDotVersion": "4.1.0",
38+
+ "fullDotVersion": "4.1.0-stackable0.0.0-dev",
39+
"scalaVersion": "2.13"
40+
};
41+
diff --git a/gradle.properties b/gradle.properties
42+
index 34e605f5a5..ab12d72c91 100644
43+
--- a/gradle.properties
44+
+++ b/gradle.properties
45+
@@ -23,7 +23,7 @@ group=org.apache.kafka
46+
# - streams/quickstart/pom.xml
47+
# - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
48+
# - streams/quickstart/java/pom.xml
49+
-version=4.1.0
50+
+version=4.1.0-stackable0.0.0-dev
51+
scalaVersion=2.13.16
52+
# Adding swaggerVersion in gradle.properties to have a single version in place for swagger
53+
swaggerVersion=2.2.25
54+
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
55+
index 2d85d3c6a6..a062e72217 100644
56+
--- a/streams/quickstart/java/pom.xml
57+
+++ b/streams/quickstart/java/pom.xml
58+
@@ -26,7 +26,7 @@
59+
<parent>
60+
<groupId>org.apache.kafka</groupId>
61+
<artifactId>streams-quickstart</artifactId>
62+
- <version>4.1.0</version>
63+
+ <version>4.1.0-stackable0.0.0-dev</version>
64+
<relativePath>..</relativePath>
65+
</parent>
66+
67+
diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
68+
index b4b2ce160a..b820917c54 100644
69+
--- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
70+
+++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
71+
@@ -29,7 +29,7 @@
72+
73+
<properties>
74+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
75+
- <kafka.version>4.1.0</kafka.version>
76+
+ <kafka.version>4.1.0-stackable0.0.0-dev</kafka.version>
77+
<slf4j.version>2.0.16</slf4j.version>
78+
</properties>
79+
80+
diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml
81+
index b452399ae0..8d5fa3a603 100644
82+
--- a/streams/quickstart/pom.xml
83+
+++ b/streams/quickstart/pom.xml
84+
@@ -22,7 +22,7 @@
85+
<groupId>org.apache.kafka</groupId>
86+
<artifactId>streams-quickstart</artifactId>
87+
<packaging>pom</packaging>
88+
- <version>4.1.0</version>
89+
+ <version>4.1.0-stackable0.0.0-dev</version>
90+
91+
<name>Kafka Streams :: Quickstart</name>
92+
93+
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
94+
index dd8e97fa30..488b5d20dc 100644
95+
--- a/tests/kafkatest/__init__.py
96+
+++ b/tests/kafkatest/__init__.py
97+
@@ -22,4 +22,4 @@
98+
# Instead, in development branches, the version should have a suffix of the form ".devN"
99+
#
100+
# For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0"
101+
-__version__ = '4.1.0'
102+
+__version__ = '4.1.0-stackable0.0.0-dev'

0 commit comments

Comments
 (0)