Skip to content

Commit 9123dcf

Browse files
committed
chore(kafka): Add a patches for 3.7.2
1 parent b388251 commit 9123dcf

File tree

5 files changed

+129
-1
lines changed

5 files changed

+129
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ All notable changes to this project will be documented in this file.
1717
- statsd-exporter: Bump version to 0.28.0 ([#982]).
1818
- kafka: Bump version to 3.9.0 ([#988]).
1919

20+
### Changed
21+
22+
- kafka: Bump 3.7.1 to 3.7.2 ([#968]).
23+
2024
### Removed
2125

2226
- kafka: Remove `kubectl`, as we are now using listener-op ([#884]).
23-
- kafka: Remove 3.7.1 ([#988]).
2427
- vector: remove version 0.41.1 ([#980]).
2528
- opa: remove version 0.66.0 ([#981])
2629

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 <[email protected]>
3+
Date: Mon, 3 Feb 2025 13:54:54 +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 3a9914a9cd..398a7c994e 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+
@@ -1015,7 +1057,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: 79a8f2b5f44f9d5a6867190d1dfc463d08d60b82
74+
--
75+
2.40.1
76+
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 <[email protected]>
3+
Date: Mon, 3 Feb 2025 13:56:21 +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 398a7c994e..6fb5efe645 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+
@@ -161,7 +163,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+
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 = "79a8f2b5f44f9d5a6867190d1dfc463d08d60b82"

kafka/versions.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
versions = [
2+
{
3+
"product": "3.7.2",
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.8.0",
413
"java-base": "21",

0 commit comments

Comments
 (0)