Skip to content

Commit 30268a9

Browse files
committed
Merge remote-tracking branch 'origin/main' into airflow-3.2.1
2 parents 26d551e + 493c371 commit 30268a9

30 files changed

Lines changed: 830 additions & 35 deletions

.github/workflows/mirror.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
7373
- name: Publish Container Image on oci.stackable.tech/sdp
7474
if: inputs.destination-project == 'sdp'
75-
uses: stackabletech/actions/publish-image@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
75+
uses: stackabletech/actions/publish-image@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
7676
with:
7777
image-registry-uri: oci.stackable.tech
7878
image-registry-username: robot$sdp+github-action-build
@@ -112,7 +112,7 @@ jobs:
112112
113113
- name: Publish and Sign Image Index Manifest to oci.stackable.tech/sdp
114114
if: inputs.destination-project == 'sdp'
115-
uses: stackabletech/actions/publish-image-index-manifest@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
115+
uses: stackabletech/actions/publish-image-index-manifest@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
116116
with:
117117
image-registry-uri: oci.stackable.tech
118118
image-registry-username: robot$sdp+github-action-build

.github/workflows/pr_pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
persist-credentials: false
2323
fetch-depth: 0
2424

25-
- uses: stackabletech/actions/run-pre-commit@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
25+
- uses: stackabletech/actions/run-pre-commit@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
2626
with:
2727
python-version: ${{ env.PYTHON_VERSION }}
2828
rust: ${{ env.RUST_TOOLCHAIN_VERSION }}

.github/workflows/reusable_build_image.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
persist-credentials: false
8989

9090
- id: shard
91-
uses: stackabletech/actions/shard@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
91+
uses: stackabletech/actions/shard@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
9292
with:
9393
product-name: ${{ inputs.product-name }}
9494
outputs:
@@ -115,11 +115,11 @@ jobs:
115115
persist-credentials: false
116116

117117
- name: Free Disk Space
118-
uses: stackabletech/actions/free-disk-space@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
118+
uses: stackabletech/actions/free-disk-space@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
119119

120120
- name: Build Product Image
121121
id: build
122-
uses: stackabletech/actions/build-product-image@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
122+
uses: stackabletech/actions/build-product-image@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
123123
with:
124124
registry-namespace: ${{ inputs.registry-namespace }}
125125
product-name: ${{ inputs.product-name }}
@@ -128,7 +128,7 @@ jobs:
128128

129129
- name: Publish Container Image on oci.stackable.tech
130130
if: inputs.publish
131-
uses: stackabletech/actions/publish-image@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
131+
uses: stackabletech/actions/publish-image@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
132132
with:
133133
image-registry-uri: oci.stackable.tech
134134
image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build
@@ -144,7 +144,7 @@ jobs:
144144

145145
- name: Publish Container Image on quay.io
146146
if: inputs.publish && inputs.publish-to-quay
147-
uses: stackabletech/actions/publish-image@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
147+
uses: stackabletech/actions/publish-image@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
148148
with:
149149
image-registry-uri: quay.io
150150
image-registry-username: stackable+robot_${{ inputs.registry-namespace }}_github_action_build
@@ -177,7 +177,7 @@ jobs:
177177

178178
- name: Publish and Sign Image Index Manifest to oci.stackable.tech
179179
if: inputs.publish
180-
uses: stackabletech/actions/publish-image-index-manifest@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
180+
uses: stackabletech/actions/publish-image-index-manifest@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
181181
with:
182182
image-registry-uri: oci.stackable.tech
183183
image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build
@@ -192,7 +192,7 @@ jobs:
192192

193193
- name: Publish and Sign Image Index Manifest to quay.io
194194
if: inputs.publish && inputs.publish-to-quay
195-
uses: stackabletech/actions/publish-image-index-manifest@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
195+
uses: stackabletech/actions/publish-image-index-manifest@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
196196
with:
197197
image-registry-uri: quay.io
198198
image-registry-username: stackable+robot_${{ inputs.registry-namespace }}_github_action_build
@@ -214,7 +214,7 @@ jobs:
214214
if: failure() || (github.run_attempt > 1 && !cancelled())
215215
steps:
216216
- name: Send Notification
217-
uses: stackabletech/actions/send-slack-notification@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
217+
uses: stackabletech/actions/send-slack-notification@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
218218
with:
219219
publish-manifests-result: ${{ needs.publish_manifests.result }}
220220
build-result: ${{ needs.build.result }}

.github/workflows/ubi-rust-builder.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
persist-credentials: false
4141

4242
- name: Login to Stackable Harbor
43-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
43+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
4444
with:
4545
registry: oci.stackable.tech
4646
username: robot$sdp+github-action-build
@@ -92,7 +92,7 @@ jobs:
9292
persist-credentials: false
9393

9494
- name: Login to Stackable Harbor
95-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
95+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
9696
with:
9797
registry: oci.stackable.tech
9898
username: robot$sdp+github-action-build
@@ -123,7 +123,7 @@ jobs:
123123
if: failure() || (github.run_attempt > 1 && !cancelled())
124124
steps:
125125
- name: Send Notification
126-
uses: stackabletech/actions/send-slack-notification@8a8085be0a8cec3d24ad3970e602d65be487da6a # v0.14.1
126+
uses: stackabletech/actions/send-slack-notification@1b8db26b7406c66a7ab74e344a9e54edb2bc2690 # v0.14.3
127127
with:
128128
publish-manifests-result: ${{ needs.publish_manifests.result }}
129129
build-result: ${{ needs.build.result }}

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ All notable changes to this project will be documented in this file.
1212
- nifi: Backport NIFI-15901 to 2.x versions ([#1481]).
1313
- testing-tools: Added grpcurl utility ([#1493]).
1414
- opa: Add `1.16.2` ([#1509]).
15+
- kafka: Add `3.9.2` and `4.2.1` ([#1483]).
16+
- trino: Add `481` ([#1518]).
1517

1618
### Changed
1719

1820
- hbase: Update `hbase-opa-authorizer` from `0.1.0` to `0.2.0` and then `0.3.0` ([#1446], [#1454]).
21+
- ci: Bump `docker/login-action` from `v3.6.0` to `v4.1.0` and `stackabletech/actions` to `v0.14.3` to escape Node.js 20 deprecation ([#1507]).
1922

2023
### Fixed
2124

@@ -40,10 +43,13 @@ All notable changes to this project will be documented in this file.
4043
[#1474]: https://github.com/stackabletech/docker-images/pull/1474
4144
[#1476]: https://github.com/stackabletech/docker-images/pull/1476
4245
[#1481]: https://github.com/stackabletech/docker-images/pull/1481
46+
[#1483]: https://github.com/stackabletech/docker-images/pull/1483
4347
[#1493]: https://github.com/stackabletech/docker-images/pull/1493
48+
[#1507]: https://github.com/stackabletech/docker-images/pull/1507
4449
[#1509]: https://github.com/stackabletech/docker-images/pull/1509
4550
[#1510]: https://github.com/stackabletech/docker-images/pull/1510
4651
[#1512]: https://github.com/stackabletech/docker-images/pull/1512
52+
[#1518]: https://github.com/stackabletech/docker-images/pull/1518
4753

4854
## [26.3.0] - 2026-03-16
4955

java-devel/boil-config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ stackable-devel = "1.0.0"
1313
[versions."21".local-images]
1414
stackable-devel = "1.0.0"
1515

16-
1716
[versions."24".local-images]
1817
stackable-devel = "1.0.0"
1918

kafka/boil-config.toml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ java-devel = "21"
1212
scala-version = "2.13"
1313
jmx-exporter-version = "1.3.0"
1414

15+
[versions."3.9.2".local-images]
16+
java-base = "21"
17+
java-devel = "21"
18+
"kafka/kcat" = "1.7.0"
19+
"kafka/kafka-opa-plugin" = "1.5.1"
20+
"shared/reload4j" = "1.2.25"
21+
22+
[versions."3.9.2".build-arguments]
23+
scala-version = "2.13"
24+
jmx-exporter-version = "1.3.0"
25+
1526
[versions."4.1.1".local-images]
1627
java-base = "24"
1728
java-devel = "24"
@@ -25,3 +36,18 @@ java-devel = "24"
2536
[versions."4.1.1".build-arguments]
2637
scala-version = "2.13"
2738
jmx-exporter-version = "1.3.0"
39+
40+
[versions."4.2.1".local-images]
41+
# For JVM compatibility see README.md and docs/getting-started/compatibility.md in the Kafka repository
42+
java-base = "25"
43+
java-devel = "25"
44+
"kafka/kcat" = "1.7.0"
45+
"kafka/kafka-opa-plugin" = "1.5.1"
46+
# TODO: this is not used in this version but it's added
47+
# to avoid major changes to the Kafka image build on short notice.
48+
# Building this image is quick and in CI should not even be noticed.
49+
"shared/reload4j" = "1.2.25"
50+
51+
[versions."4.2.1".build-arguments]
52+
scala-version = "2.13"
53+
jmx-exporter-version = "1.3.0"
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
From c19817ee82f7b90aac0a8be66e3efe17f268eb35 Mon Sep 17 00:00:00 2001
2+
From: Lukas Voetmand <lukas.voetmand@stackable.tech>
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 381e964d13..f51f410858 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 {
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 343021661d7ed166a7555e6bce9da4805340f6cb Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <git@lars-francke.de>
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 f51f410858..5ccd99e024 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 {

0 commit comments

Comments
 (0)