Skip to content

Commit 7bb86bb

Browse files
razvanrazvan
authored
Merge branch 'main' into fix/hbase-containerdebug
2 parents a756610 + 53da3b0 commit 7bb86bb

File tree

11 files changed

+169
-17
lines changed

11 files changed

+169
-17
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# Byte-compiled / optimized / DLL files
22
__pycache__/
33
*.py[cod]
4+
5+
patchable-work/

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ All notable changes to this project will be documented in this file.
1515
- vector: Add version 0.43.1 ([#980]).
1616
- opa: Add version 1.0.0 ([#981]).
1717
- statsd-exporter: Bump version to 0.28.0 ([#982]).
18+
- git-sync: Bump version to 4.4.0 ([#990]).
19+
- kafka: Bump version to 3.9.0 ([#988]).
20+
21+
### Changed
22+
23+
- kafka: Bump 3.7.1 to 3.7.2 ([#968]).
1824

1925
### Removed
2026

@@ -38,6 +44,8 @@ All notable changes to this project will be documented in this file.
3844
[#980]: https://github.com/stackabletech/docker-images/pull/980
3945
[#981]: https://github.com/stackabletech/docker-images/pull/981
4046
[#982]: https://github.com/stackabletech/docker-images/pull/982
47+
[#990]: https://github.com/stackabletech/docker-images/pull/990
48+
[#988]: https://github.com/stackabletech/docker-images/pull/988
4149

4250
## [24.11.1] - 2025-01-14
4351

‎airflow/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG GIT_SYNC
55

66
# For updated versions check https://github.com/kubernetes/git-sync/releases
77
# which should contain a image location (e.g. registry.k8s.io/git-sync/git-sync:v3.6.8)
8-
FROM oci.stackable.tech/sdp/git-sync:${GIT_SYNC} AS gitsync-image
8+
FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS gitsync-image
99

1010
FROM stackable/image/statsd_exporter AS statsd_exporter-builder
1111

‎airflow/versions.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
{
33
"product": "2.9.2",
44
"python": "3.9",
5-
"git_sync": "v4.2.4",
5+
"git_sync": "v4.4.0",
66
"statsd_exporter": "0.28.0",
77
"tini": "0.19.0",
88
"vector": "0.43.1",
99
},
1010
{
1111
"product": "2.9.3",
1212
"python": "3.9",
13-
"git_sync": "v4.2.4",
13+
"git_sync": "v4.4.0",
1414
"statsd_exporter": "0.28.0",
1515
"tini": "0.19.0",
1616
"vector": "0.43.1",
1717
},
1818
{
1919
"product": "2.10.2",
2020
"python": "3.12",
21-
"git_sync": "v4.2.4",
21+
"git_sync": "v4.4.0",
2222
"statsd_exporter": "0.28.0",
2323
"tini": "0.19.0",
2424
"vector": "0.43.1",

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
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+
110
diff --git a/build.gradle b/build.gradle
2-
index 32e6e8f..13a0def 100644
11+
index 3a9914a9cd..398a7c994e 100644
312
--- a/build.gradle
413
+++ b/build.gradle
5-
@@ -48,6 +48,47 @@ plugins {
14+
@@ -48,6 +48,48 @@ plugins {
615
// artifacts - see https://github.com/johnrengelman/shadow/issues/901
716
id 'com.github.johnrengelman.shadow' version '8.1.0' apply false
817
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 +54,23 @@ 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+
@@ -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+

‎kafka/stackable/patches/3.7.1/002-use-stackable-repo.patch‎ renamed to ‎kafka/stackable/patches/3.7.2/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: Mon, 3 Feb 2025 13:56:21 +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 398a7c994e..6fb5efe645 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+
@@ -161,7 +163,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

‎kafka/stackable/patches/3.7.2/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 = "79a8f2b5f44f9d5a6867190d1dfc463d08d60b82"

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
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+
10+
diff --git a/build.gradle b/build.gradle
11+
index 5b064f4203..2d7b442e7b 100644
12+
--- a/build.gradle
13+
+++ b/build.gradle
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
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+
64+
base-commit: 84caaa6e9da06435411510a81fa321d4f99c351f
65+
--
66+
2.40.1
67+

‎kafka/stackable/patches/3.9.0/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 <[email protected]>
3+
Date: Wed, 29 Jan 2025 17:00:48 +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 2d7b442e7b..3e727be2f0 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+
@@ -171,7 +173,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.9.0/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 = "84caaa6e9da06435411510a81fa321d4f99c351f"

0 commit comments

Comments
 (0)