Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

patchable-work/
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ All notable changes to this project will be documented in this file.
- vector: Add version 0.43.1 ([#980]).
- opa: Add version 1.0.0 ([#981]).
- statsd-exporter: Bump version to 0.28.0 ([#982]).
- kafka: Bump version to 3.9.0 ([#988]).

### Removed

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

Expand All @@ -38,6 +40,7 @@ All notable changes to this project will be documented in this file.
[#980]: https://github.com/stackabletech/docker-images/pull/980
[#981]: https://github.com/stackabletech/docker-images/pull/981
[#982]: https://github.com/stackabletech/docker-images/pull/982
[#988]: https://github.com/stackabletech/docker-images/pull/988

## [24.11.1] - 2025-01-14

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick Larsen <[email protected]>
Date: Wed, 29 Jan 2025 16:50:30 +0100
Subject: Add cyclonedx-plugin

---
build.gradle | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)

diff --git a/build.gradle b/build.gradle
index 32e6e8f..13a0def 100644
index 5b064f4203..2d7b442e7b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,6 +48,47 @@ plugins {
// artifacts - see https://github.com/johnrengelman/shadow/issues/901
id 'com.github.johnrengelman.shadow' version '8.1.0' apply false
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
@@ -51,6 +51,48 @@ plugins {
// 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.
// 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
id 'com.diffplug.spotless' version "6.14.0" apply false
+ id 'org.cyclonedx.bom' version '1.10.0'
+}
+
Expand Down Expand Up @@ -45,8 +54,14 @@ index 32e6e8f..13a0def 100644
+ 'upgrade-system-tests-33',
+ 'upgrade-system-tests-34',
+ 'upgrade-system-tests-35',
+ 'upgrade-system-tests-36'
+ 'upgrade-system-tests-36',
+ 'upgrade-system-tests-37'
+ ]
}

ext {

base-commit: 84caaa6e9da06435411510a81fa321d4f99c351f
--
2.40.1

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From e5102449fe825cfbba20ce6ace1f51cd91550780 Mon Sep 17 00:00:00 2001
From: Lars Francke <[email protected]>
Date: Thu, 12 Dec 2024 10:09:47 +0100
Subject: [PATCH] Change Gradle to use the Nexus Build Repo
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick Larsen <[email protected]>
Date: Wed, 29 Jan 2025 17:00:48 +0100
Subject: Use stackable maven mirror

---
build.gradle | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 92082fe7cf..3b56a2ad98 100644
index 2d7b442e7b..3e727be2f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets
Expand All @@ -22,7 +22,7 @@ index 92082fe7cf..3b56a2ad98 100644
}
apply from: "$rootDir/gradle/dependencies.gradle"

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

repositories {
Expand All @@ -34,5 +34,5 @@ index 92082fe7cf..3b56a2ad98 100644

dependencyUpdates {
--
2.47.1
2.40.1

2 changes: 2 additions & 0 deletions kafka/stackable/patches/3.9.0/patchable.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
upstream = "https://github.com/apache/kafka"
base = "84caaa6e9da06435411510a81fa321d4f99c351f"
8 changes: 4 additions & 4 deletions kafka/versions.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
versions = [
{
"product": "3.7.1",
"product": "3.8.0",
"java-base": "21",
"java-devel": "21",
"scala": "2.13",
"kcat": "1.7.0",
"opa_authorizer": "1.5.1",
"jmx_exporter": "1.0.1-stackable",
"jmx_exporter": "1.1.0",
},
{
"product": "3.8.0",
"product": "3.9.0",
"java-base": "21",
"java-devel": "21",
"scala": "2.13",
"kcat": "1.7.0",
"opa_authorizer": "1.5.1",
"jmx_exporter": "1.0.1-stackable",
"jmx_exporter": "1.1.0",
},
]