Skip to content

Commit 59f5241

Browse files
NickLarsenNZdervoeti
NickLarsenNZ
authored and
dervoeti
committed
fix(kafka): Restore version 3.7.1, bump 3.8.0 to 3.8.1 (#995)
* fix(kafka): Restore version 3.7.1 * fix(kafka): Replace version 3.8.0 with 3.8.1 * chore: Update changelog
1 parent 5e2ecc6 commit 59f5241

7 files changed

+132
-7
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ All notable changes to this project will be documented in this file.
1717
- statsd-exporter: Bump version to 0.28.0 ([#982]).
1818
- druid: Add version 31.0.1 ([#984])
1919
- git-sync: Bump version to 4.4.0 ([#990]).
20-
- kafka: Bump version to 3.9.0 ([#988]).
20+
- kafka: Add versions 3.7.2 and 3.9.0 ([#988]).
2121

2222
### Changed
2323

24-
- kafka: Bump 3.7.1 to 3.7.2 ([#968]).
24+
- kafka: Bump 3.8.0 to 3.8.1 ([#995]).
2525
- Update registry references to oci ([#989]).
2626

2727
### Removed
@@ -50,6 +50,7 @@ All notable changes to this project will be documented in this file.
5050
[#988]: https://github.com/stackabletech/docker-images/pull/988
5151
[#989]: https://github.com/stackabletech/docker-images/pull/989
5252
[#990]: https://github.com/stackabletech/docker-images/pull/990
53+
[#995]: https://github.com/stackabletech/docker-images/pull/995
5354

5455
## [24.11.1] - 2025-01-14
5556

‎kafka/stackable/patches/3.8.0/001-cyclonedx-plugin.patch renamed to ‎kafka/stackable/patches/3.7.1/001-cyclonedx-plugin.patch

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/build.gradle b/build.gradle
2-
index 92082fe..e3d6c72 100644
2+
index 32e6e8f..13a0def 100644
33
--- a/build.gradle
44
+++ b/build.gradle
5-
@@ -48,6 +48,48 @@ plugins {
5+
@@ -48,6 +48,47 @@ plugins {
66
// artifacts - see https://github.com/johnrengelman/shadow/issues/901
77
id 'com.github.johnrengelman.shadow' version '8.1.0' apply false
88
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
@@ -45,8 +45,7 @@ index 92082fe..e3d6c72 100644
4545
+ 'upgrade-system-tests-33',
4646
+ 'upgrade-system-tests-34',
4747
+ 'upgrade-system-tests-35',
48-
+ 'upgrade-system-tests-36',
49-
+ 'upgrade-system-tests-37'
48+
+ 'upgrade-system-tests-36'
5049
+ ]
5150
}
5251

‎kafka/stackable/patches/3.8.0/002-use-stackable-repo.patch renamed to ‎kafka/stackable/patches/3.7.1/002-use-stackable-repo.patch

File renamed without changes.

‎kafka/stackable/patches/3.8.1/0001-Add-cyclonedx-plugin.patch

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nick Larsen <nick.larsen@stackable.tech>
3+
Date: Thu, 6 Feb 2025 10:21:26 +0100
4+
Subject: Add cyclonedx plugin
5+
6+
---
7+
build.gradle | 44 +++++++++++++++++++++++++++++++++++++++++++-
8+
1 file changed, 43 insertions(+), 1 deletion(-)
9+
10+
diff --git a/build.gradle b/build.gradle
11+
index 8b44b09087..fadb64fda5 100644
12+
--- a/build.gradle
13+
+++ b/build.gradle
14+
@@ -48,6 +48,48 @@ plugins {
15+
// artifacts - see https://github.com/johnrengelman/shadow/issues/901
16+
id 'com.github.johnrengelman.shadow' version '8.1.0' apply false
17+
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
18+
+ id 'org.cyclonedx.bom' version '1.10.0'
19+
+}
20+
+
21+
+cyclonedxBom {
22+
+ // Specified the type of project being built. Defaults to 'library'
23+
+ projectType = "application"
24+
+ // Specified the version of the CycloneDX specification to use. Defaults to '1.5'
25+
+ schemaVersion = "1.5"
26+
+ // Boms destination directory. Defaults to 'build/reports'
27+
+ destination = file("build/reports")
28+
+ // The file name for the generated BOMs (before the file format suffix). Defaults to 'bom'
29+
+ outputName = "bom"
30+
+ // The file format generated, can be xml, json or all for generating both. Defaults to 'all'
31+
+ outputFormat = "json"
32+
+ includeConfigs = ["runtimeClasspath"]
33+
+ // Exclude test components. This list needs to be checked and, if it changed, updated for every new Kafka version.
34+
+ // The list can be obtained by running `gradle projects | grep upgrade-system-tests`
35+
+ skipProjects = [
36+
+ 'upgrade-system-tests-0100',
37+
+ 'upgrade-system-tests-0101',
38+
+ 'upgrade-system-tests-0102',
39+
+ 'upgrade-system-tests-0110',
40+
+ 'upgrade-system-tests-10',
41+
+ 'upgrade-system-tests-11',
42+
+ 'upgrade-system-tests-20',
43+
+ 'upgrade-system-tests-21',
44+
+ 'upgrade-system-tests-22',
45+
+ 'upgrade-system-tests-23',
46+
+ 'upgrade-system-tests-24',
47+
+ 'upgrade-system-tests-25',
48+
+ 'upgrade-system-tests-26',
49+
+ 'upgrade-system-tests-27',
50+
+ 'upgrade-system-tests-28',
51+
+ 'upgrade-system-tests-30',
52+
+ 'upgrade-system-tests-31',
53+
+ 'upgrade-system-tests-32',
54+
+ 'upgrade-system-tests-33',
55+
+ 'upgrade-system-tests-34',
56+
+ 'upgrade-system-tests-35',
57+
+ 'upgrade-system-tests-36',
58+
+ 'upgrade-system-tests-37'
59+
+ ]
60+
}
61+
62+
ext {
63+
@@ -1011,7 +1053,7 @@ project(':core') {
64+
testImplementation libs.junitJupiter
65+
testImplementation libs.slf4jlog4j
66+
testImplementation libs.caffeine
67+
-
68+
+
69+
generator project(':generator')
70+
}
71+
72+
73+
base-commit: 70d6ff42debf7e17478beb899fb5756bfbdbfbb5
74+
--
75+
2.40.1
76+

‎kafka/stackable/patches/3.8.1/0002-Use-stackable-maven-mirror.patch

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nick Larsen <nick.larsen@stackable.tech>
3+
Date: Thu, 6 Feb 2025 10:25:36 +0100
4+
Subject: Use stackable maven mirror
5+
6+
---
7+
build.gradle | 8 ++++++--
8+
1 file changed, 6 insertions(+), 2 deletions(-)
9+
10+
diff --git a/build.gradle b/build.gradle
11+
index fadb64fda5..34786c0673 100644
12+
--- a/build.gradle
13+
+++ b/build.gradle
14+
@@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets
15+
16+
buildscript {
17+
repositories {
18+
- mavenCentral()
19+
+ maven {
20+
+ url 'https://build-repo.stackable.tech/repository/maven-public/'
21+
+ }
22+
}
23+
apply from: "$rootDir/gradle/dependencies.gradle"
24+
25+
@@ -168,7 +170,9 @@ ext {
26+
allprojects {
27+
28+
repositories {
29+
- mavenCentral()
30+
+ maven {
31+
+ url 'https://build-repo.stackable.tech/repository/maven-public/'
32+
+ }
33+
}
34+
35+
dependencyUpdates {
36+
--
37+
2.40.1
38+

‎kafka/stackable/patches/3.8.1/patchable.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
upstream = "https://github.com/apache/kafka"
2+
base = "70d6ff42debf7e17478beb899fb5756bfbdbfbb5"

‎kafka/versions.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
versions = [
2+
{
3+
"product": "3.7.1",
4+
"java-base": "21",
5+
"java-devel": "21",
6+
"scala": "2.13",
7+
"kcat": "1.7.0",
8+
"opa_authorizer": "1.5.1",
9+
"jmx_exporter": "1.1.0",
10+
},
211
{
312
"product": "3.7.2",
413
"java-base": "21",
@@ -9,7 +18,7 @@
918
"jmx_exporter": "1.1.0",
1019
},
1120
{
12-
"product": "3.8.0",
21+
"product": "3.8.1",
1322
"java-base": "21",
1423
"java-devel": "21",
1524
"scala": "2.13",

0 commit comments

Comments
 (0)