Skip to content

Commit 6174ad4

Browse files
NickLarsenNZNickLarsenNZ
authored
Merge branch 'main' into feat/zookeeper-backport-3.9.4-patches
2 parents 51ad194 + a6ce924 commit 6174ad4

File tree

15 files changed

+216
-39
lines changed

15 files changed

+216
-39
lines changed

‎CHANGELOG.md‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@ All notable changes to this project will be documented in this file.
4343
- nifi: Add [nifi-iceberg-bundle](https://github.com/stackabletech/nifi-iceberg-bundle) for NiFi `2.2.0` ([#1060], [#1106]).
4444
- java: Add JDK 24 ([#1097]).
4545
- ci: Add golang image to mirror workflow ([#1103]).
46-
- omid: bump version to 1.1.3 ([#1105])
47-
- hbase: add 2.6.2 and upgrade dependencies ([#1101])
48-
- kafka: Add `4.0.0` ([#1117])
49-
- Include `.tar.gz` snapshots of the product source code in container images ([#1126])
50-
- airflow: OPA authorizer for Airflow 3.x ([#1127])
46+
- omid: bump version to 1.1.3 ([#1105]).
47+
- hbase: add 2.6.2 and upgrade dependencies ([#1101]).
48+
- kafka: Add `4.0.0` ([#1117]).
49+
- Include `.tar.gz` snapshots of the product source code in container images ([#1126]).
50+
- airflow: OPA authorizer for Airflow 3.x ([#1127]).
51+
- kafka: Add `3.9.1` ([#1149]).
52+
- spark-k8s: Add `3.5.6` ([#1142]).
53+
- spark-connect-client: Add `3.5.6` ([#1142]).
54+
- git-sync: Bump version to 4.4.1 ([#1151]).
5155

5256
### Changed
5357

@@ -62,16 +66,17 @@ All notable changes to this project will be documented in this file.
6266
- yq: Bump products to use `4.45.2` ([#1090]).
6367
- cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#1090]).
6468
- vector: Bump to `0.46.1` ([#1098]).
65-
- spark: update dependencies for 3.5.5 ([#1094])
66-
- nifi: include NAR SBOMs ([#1119])
69+
- spark: update dependencies for 3.5.5 ([#1094]).
70+
- nifi: include NAR SBOMs ([#1119]).
6771
- nifi: update patch allowing to bypass host header validation starting with NiFi 2.4.0 ([#1125]).
6872
- BREAKING: kcat: Stop building kcat image ([#1124]).
69-
- containerdebug updated to 0.2.0 ([#1128])
70-
- Build Hadoop as `stackable` and configure the Stackable Nexus build-repo for the `root` user ([#1133])
73+
- containerdebug updated to 0.2.0 ([#1128]).
74+
- Build Hadoop as `stackable` and configure the Stackable Nexus build-repo for the `root` user ([#1133]).
7175
- patchable: The base branch is now configured as the git upstream branch ([#1131]).
72-
- airflow: Updates the entrypoint script and removes the check for GID == 0 ([#1138])
76+
- airflow: Updates the entrypoint script and removes the check for GID == 0 ([#1138]).
7377
- druid: Bump druiod-opa-authorizer to `0.7.0` ([#1139]).
74-
- zookeeper: backport ZOOKEEPER-4846, ZOOKEEPER-4921, ZOOKEEPER-4925 into Zookeeper 3.9.3 ([#1150])
78+
- vector: Bump to `0.47.0` ([#1152]).
79+
- zookeeper: backport ZOOKEEPER-4846, ZOOKEEPER-4921, ZOOKEEPER-4925 into Zookeeper 3.9.3 ([#1150]).
7580

7681
### Fixed
7782

@@ -101,15 +106,16 @@ All notable changes to this project will be documented in this file.
101106
Also remove the old release workflow.
102107
- zookeeper: Remove 3.9.2 ([#1093]).
103108
- Remove ubi8-rust-builder image ([#1091]).
104-
- spark: remove 3.5.2 ([#1094])
109+
- spark: remove 3.5.2 ([#1094]).
105110
- hadoop: Remove `3.3.4` and `3.4.0` ([#1099]).
106111
- opa: Remove `0.67.1` ([#1103]).
107112
- opa: Remove legacy bundle-builder from container build ([#1103]).
108113
- omid: Remove 1.1.3-SNAPSHOT ([#1105]).
109114
- hbase: Remove 2.4.18 ([#1101])
110115
- druid: Remove `30.0.0` ([#1110]).
111116
- nifi: Remove `2.2.0` ([#1114]).
112-
- kafka: Remove `3.7.1` and `3.8.0` ([#1117])
117+
- kafka: Remove `3.7.1` and `3.8.0` ([#1117]).
118+
- spark-connect-client: Remove `3.5.5` ([#1142]).
113119

114120
[nifi-iceberg-bundle]: https://github.com/stackabletech/nifi-iceberg-bundle
115121
[#1025]: https://github.com/stackabletech/docker-images/pull/1025
@@ -164,7 +170,11 @@ All notable changes to this project will be documented in this file.
164170
[#1137]: https://github.com/stackabletech/docker-images/pull/1137
165171
[#1138]: https://github.com/stackabletech/docker-images/pull/1138
166172
[#1139]: https://github.com/stackabletech/docker-images/pull/1139
173+
[#1142]: https://github.com/stackabletech/docker-images/pull/1142
174+
[#1149]: https://github.com/stackabletech/docker-images/pull/1149
167175
[#1150]: https://github.com/stackabletech/docker-images/pull/1150
176+
[#1151]: https://github.com/stackabletech/docker-images/pull/1151
177+
[#1152]: https://github.com/stackabletech/docker-images/pull/1152
168178

169179
## [25.3.0] - 2025-03-21
170180

‎airflow/versions.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,51 @@
22
{
33
"product": "2.9.3",
44
"python": "3.9",
5-
"git_sync": "v4.4.0",
5+
"git_sync": "v4.4.1",
66
"s3fs": "2024.9.0",
77
"cyclonedx_bom": "6.0.0",
88
"shared/statsd-exporter": "0.28.0",
99
"tini": "0.19.0",
10-
"vector": "0.46.1",
10+
"vector": "0.47.0",
1111
"uv": "0.7.8",
1212
"extras": "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino",
1313
"opa_auth_manager": "airflow-2",
1414
},
1515
{
1616
"product": "2.10.4",
1717
"python": "3.12",
18-
"git_sync": "v4.4.0",
18+
"git_sync": "v4.4.1",
1919
"s3fs": "2024.9.0",
2020
"cyclonedx_bom": "6.0.0",
2121
"shared/statsd-exporter": "0.28.0",
2222
"tini": "0.19.0",
23-
"vector": "0.46.1",
23+
"vector": "0.47.0",
2424
"uv": "0.7.8",
2525
"extras": "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino",
2626
"opa_auth_manager": "airflow-2",
2727
},
2828
{
2929
"product": "2.10.5",
3030
"python": "3.12",
31-
"git_sync": "v4.4.0",
31+
"git_sync": "v4.4.1",
3232
"s3fs": "2024.9.0",
3333
"cyclonedx_bom": "6.0.0",
3434
"shared/statsd-exporter": "0.28.0",
3535
"tini": "0.19.0",
36-
"vector": "0.46.1",
36+
"vector": "0.47.0",
3737
"uv": "0.7.8",
3838
"extras": "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino",
3939
"opa_auth_manager": "airflow-2",
4040
},
4141
{
4242
"product": "3.0.1",
4343
"python": "3.12",
44-
"git_sync": "v4.4.0",
44+
"git_sync": "v4.4.1",
4545
"s3fs": "2024.9.0",
4646
"cyclonedx_bom": "6.0.0",
4747
"shared/statsd-exporter": "0.28.0",
4848
"tini": "0.19.0",
49-
"vector": "0.46.1",
49+
"vector": "0.47.0",
5050
"uv": "0.7.8",
5151
"extras": "async,amazon,celery,cncf-kubernetes,docker,elasticsearch,fab,ftp,grpc,hashicorp,http,ldap,google,microsoft-azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,trino",
5252
"opa_auth_manager": "airflow-3",

‎java-base/versions.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
versions = [
22
{
33
"product": "8",
4-
"vector": "0.46.1",
4+
"vector": "0.47.0",
55
},
66
{
77
"product": "11",
8-
"vector": "0.46.1",
8+
"vector": "0.47.0",
99
},
1010
{
1111
"product": "17",
12-
"vector": "0.46.1",
12+
"vector": "0.47.0",
1313
},
1414
{
1515
"product": "21",
16-
"vector": "0.46.1",
16+
"vector": "0.47.0",
1717
},
1818
{
1919
"product": "22",
20-
"vector": "0.46.1",
20+
"vector": "0.47.0",
2121
},
2222
{
2323
"product": "23",
24-
"vector": "0.46.1",
24+
"vector": "0.47.0",
2525
},
2626
{
2727
"product": "24",
28-
"vector": "0.46.1",
28+
"vector": "0.47.0",
2929
},
3030
]

‎kafka/stackable/patches/3.9.1/0001-Add-CycloneDX-plugin.patch‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
From 9f5ef4ff9f1868244326a56ea7c22c5c7c21253c Mon Sep 17 00:00:00 2001
2+
From: Lukas Voetmand <[email protected]>
3+
Date: Thu, 17 Oct 2024 11:01:40 +0200
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 6b4725d542..f7894f379e 100644
12+
--- a/build.gradle
13+
+++ b/build.gradle
14+
@@ -48,6 +48,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 {

‎kafka/stackable/patches/3.9.1/0002-Change-Gradle-to-use-the-Nexus-Build-Repo.patch‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 4de60cd0100bffdd4b92133840ab25247187763d 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: Change Gradle to use the Nexus Build Repo
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 f7894f379e..a176efd936 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 {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
base = "f745dfdcee2b9851204ddbbcd423626ab87294bc"
2+
mirror = "https://github.com/stackabletech/kafka.git"

‎kafka/versions.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
"opa_authorizer": "1.5.1",
1818
"jmx_exporter": "1.2.0",
1919
},
20+
{
21+
"product": "3.9.1",
22+
"java-base": "21",
23+
"java-devel": "21",
24+
"scala": "2.13",
25+
"kafka/kcat": "1.7.0",
26+
"opa_authorizer": "1.5.1",
27+
"jmx_exporter": "1.2.0",
28+
},
2029
{
2130
"product": "4.0.0",
2231
"java-base": "23",

‎nifi/versions.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"product": "1.27.0",
44
"java-base": "11",
55
"java-devel": "11", # There is an error when trying to use the jdk 21 (since nifi 1.26.0)
6-
"git_sync": "v4.4.0",
6+
"git_sync": "v4.4.1",
77
"nifi_opa_authorizer_plugin": "0.1.0",
88
},
99
{
1010
"product": "1.28.1",
1111
"java-base": "11",
1212
"java-devel": "11",
13-
"git_sync": "v4.4.0",
13+
"git_sync": "v4.4.1",
1414
"nifi_opa_authorizer_plugin": "0.1.0",
1515
},
1616
{
1717
"product": "2.4.0",
1818
"java-base": "21",
1919
"java-devel": "21",
20-
"git_sync": "v4.4.0",
20+
"git_sync": "v4.4.1",
2121
"nifi_iceberg_bundle": "0.0.4",
2222
"nifi_opa_authorizer_plugin": "0.1.0",
2323
},

‎opa/versions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
versions = [
22
{
33
"product": "1.4.2",
4-
"vector": "0.46.1",
4+
"vector": "0.47.0",
55
"golang": "1.23.9",
66
"stackable-devel": "1.0.0",
77
},
88
{
99
"product": "1.0.1",
10-
"vector": "0.46.1",
10+
"vector": "0.47.0",
1111
"golang": "1.23.9",
1212
"stackable-devel": "1.0.0",
1313
},

‎spark-connect-client/versions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
versions = [
22
{
3-
"product": "3.5.5",
3+
"product": "3.5.6",
44
"spark-k8s": "3.5.5",
55
"java-base": "17",
66
"python": "3.11",

0 commit comments

Comments
 (0)