Skip to content

Commit 982712d

Browse files
committed
feat(kafka): Add 3.9.0, remove 3.7.1
1 parent acb678d commit 982712d

File tree

4 files changed

+34
-17
lines changed

4 files changed

+34
-17
lines changed

kafka/stackable/patches/3.7.1/001-cyclonedx-plugin.patch renamed to kafka/stackable/patches/3.9.0/0001-Add-cyclonedx-plugin.patch

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nick Larsen <[email protected]>
3+
Date: Wed, 29 Jan 2025 16:50:30 +0100
4+
Subject: Add cyclonedx-plugin
5+
6+
---
7+
build.gradle | 42 ++++++++++++++++++++++++++++++++++++++++++
8+
1 file changed, 42 insertions(+)
9+
110
diff --git a/build.gradle b/build.gradle
2-
index 32e6e8f..13a0def 100644
11+
index 5b064f4203..2d7b442e7b 100644
312
--- a/build.gradle
413
+++ b/build.gradle
5-
@@ -48,6 +48,47 @@ plugins {
6-
// artifacts - see https://github.com/johnrengelman/shadow/issues/901
7-
id 'com.github.johnrengelman.shadow' version '8.1.0' apply false
8-
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
14+
@@ -51,6 +51,48 @@ plugins {
15+
// 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.
16+
// 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
17+
id 'com.diffplug.spotless' version "6.14.0" apply false
918
+ id 'org.cyclonedx.bom' version '1.10.0'
1019
+}
1120
+
@@ -45,8 +54,14 @@ index 32e6e8f..13a0def 100644
4554
+ 'upgrade-system-tests-33',
4655
+ 'upgrade-system-tests-34',
4756
+ 'upgrade-system-tests-35',
48-
+ 'upgrade-system-tests-36'
57+
+ 'upgrade-system-tests-36',
58+
+ 'upgrade-system-tests-37'
4959
+ ]
5060
}
5161

5262
ext {
63+
64+
base-commit: 84caaa6e9da06435411510a81fa321d4f99c351f
65+
--
66+
2.40.1
67+

kafka/stackable/patches/3.7.1/002-use-stackable-repo.patch renamed to kafka/stackable/patches/3.9.0/0002-Use-stackable-maven-mirror.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From e5102449fe825cfbba20ce6ace1f51cd91550780 Mon Sep 17 00:00:00 2001
2-
From: Lars Francke <[email protected]>
3-
Date: Thu, 12 Dec 2024 10:09:47 +0100
4-
Subject: [PATCH] Change Gradle to use the Nexus Build Repo
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nick Larsen <[email protected]>
3+
Date: Wed, 29 Jan 2025 17:00:48 +0100
4+
Subject: Use stackable maven mirror
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 92082fe7cf..3b56a2ad98 100644
11+
index 2d7b442e7b..3e727be2f0 100644
1212
--- a/build.gradle
1313
+++ b/build.gradle
1414
@@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets
@@ -22,7 +22,7 @@ index 92082fe7cf..3b56a2ad98 100644
2222
}
2323
apply from: "$rootDir/gradle/dependencies.gradle"
2424

25-
@@ -126,7 +128,9 @@ ext {
25+
@@ -171,7 +173,9 @@ ext {
2626
allprojects {
2727

2828
repositories {
@@ -34,5 +34,5 @@ index 92082fe7cf..3b56a2ad98 100644
3434

3535
dependencyUpdates {
3636
--
37-
2.47.1
37+
2.40.1
3838

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 = "84caaa6e9da06435411510a81fa321d4f99c351f"

kafka/versions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
versions = [
22
{
3-
"product": "3.7.1",
3+
"product": "3.8.0",
44
"java-base": "21",
55
"java-devel": "21",
66
"scala": "2.13",
77
"kcat": "1.7.0",
88
"opa_authorizer": "1.5.1",
9-
"jmx_exporter": "1.0.1-stackable",
9+
"jmx_exporter": "1.1.0",
1010
},
1111
{
12-
"product": "3.8.0",
12+
"product": "3.9.0",
1313
"java-base": "21",
1414
"java-devel": "21",
1515
"scala": "2.13",
1616
"kcat": "1.7.0",
1717
"opa_authorizer": "1.5.1",
18-
"jmx_exporter": "1.0.1-stackable",
18+
"jmx_exporter": "1.1.0",
1919
},
2020
]

0 commit comments

Comments
 (0)