Skip to content

feat(trino): Replace 469 with 470 #999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ All notable changes to this project will be documented in this file.
- trino: Add 469 ([#993]).
- trino-cli: Add version 469 ([#993]).
- trino-storage-connector: Add version 469 ([#996]).
- trino: Add 470 ([#999]).
- trino-cli: Add version 470 ([#999]).
- trino-storage-connector: Add version 470 ([#999]).

### Changed

Expand All @@ -33,7 +36,10 @@ All notable changes to this project will be documented in this file.

- kafka: Remove `kubectl`, as we are now using listener-op ([#884]).
- vector: remove version 0.41.1 ([#980]).
- opa: remove version 0.66.0 ([#981])
- opa: remove version 0.66.0 ([#981]).
- trino: Remove 469 ([#999]).
- trino-cli: Remove version 469 ([#999]).
- trino-storage-connector: Remove version 469 ([#999]).

### Fixed

Expand All @@ -59,6 +65,7 @@ All notable changes to this project will be documented in this file.
[#993]: https://github.com/stackabletech/docker-images/pull/993
[#995]: https://github.com/stackabletech/docker-images/pull/995
[#996]: https://github.com/stackabletech/docker-images/pull/996
[#999]: https://github.com/stackabletech/docker-images/pull/999

## [24.11.1] - 2025-01-14

Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion trino-cli/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# It's therefore ok if we only support a single version at a time.
versions = [
{
"product": "469",
"product": "470",
"java-base": "23",
},
]
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Fri, 7 Feb 2025 12:32:20 +0100
Date: Mon, 10 Feb 2025 12:20:07 +0100
Subject: Add cyclonedx plugin

---
pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2176aba..91e9197 100644
index ddd620e..bbfcb96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -545,6 +545,23 @@
Expand Down Expand Up @@ -36,7 +36,7 @@ index 2176aba..91e9197 100644
</build>
</project>

base-commit: e2612ce1e2801211dc090bab32f28107b563a2ae
base-commit: 1b25d617940f14a844a43ee34aa705f7d11fbaf9
--
2.40.1

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
upstream = "https://github.com/snowlift/trino-storage"
base = "e2612ce1e2801211dc090bab32f28107b563a2ae"
base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"
2 changes: 1 addition & 1 deletion trino-storage-connector/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"java-devel": "22",
},
{
"product": "469",
"product": "470",
"java-devel": "23",
},
]
2 changes: 0 additions & 2 deletions trino/stackable/patches/469/patchable.toml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Tue, 4 Feb 2025 10:49:16 +0100
Date: Mon, 10 Feb 2025 12:16:43 +0100
Subject: Add cyclonedx plugin

---
pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0d27151d77..b1682d7ab3 100644
index a1604d5ebe..3f9f794504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2850,6 +2850,24 @@
@@ -2814,6 +2814,24 @@
</excludes>
</configuration>
</plugin>
Expand All @@ -37,7 +37,7 @@ index 0d27151d77..b1682d7ab3 100644
</build>


base-commit: 39ef08e249549a6616916539f4ad21032d084c7a
base-commit: 05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf
--
2.40.1

2 changes: 2 additions & 0 deletions trino/stackable/patches/470/patchable.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
upstream = "https://github.com/trinodb/trino"
base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"
4 changes: 2 additions & 2 deletions trino/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"trino-storage-connector": "455",
},
{
"product": "469",
"product": "470",
"java-base": "23",
"java-devel": "23",
"jmx_exporter": "1.1.0",
"trino-storage-connector": "469",
"trino-storage-connector": "470",
},
]