From c92ff530256e9f8860a65d744d6a764c9fe52bbf Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 17:42:12 +0200 Subject: [PATCH 1/2] chore(trino): Remove 455 --- CHANGELOG.md | 3 ++ .../455/0001-Add-CycloneDX-plugin.patch | 37 ------------------ .../stackable/patches/455/patchable.toml | 2 - trino-storage-connector/versions.py | 4 -- .../455/0001-Add-CycloneDX-plugin.patch | 38 ------------------- trino/stackable/patches/455/patchable.toml | 2 - trino/versions.py | 7 ---- 7 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 trino-storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch delete mode 100644 trino-storage-connector/stackable/patches/455/patchable.toml delete mode 100644 trino/stackable/patches/455/0001-Add-CycloneDX-plugin.patch delete mode 100644 trino/stackable/patches/455/patchable.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index f5b6ce61b..f35a518c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,8 @@ All notable changes to this project will be documented in this file. - ci: Remove Nexus steps from build, mirror and release workflows ([#1056]). Also remove the old release workflow. +- trino: Remove `455` ([#1095]). +- trino-storage-connector: Remove `455` ([#1095]). [#1025]: https://github.com/stackabletech/docker-images/pull/1025 [#1027]: https://github.com/stackabletech/docker-images/pull/1027 @@ -81,6 +83,7 @@ All notable changes to this project will be documented in this file. [#1055]: https://github.com/stackabletech/docker-images/pull/1055 [#1056]: https://github.com/stackabletech/docker-images/pull/1056 [#1090]: https://github.com/stackabletech/docker-images/pull/1090 +[#1095]: https://github.com/stackabletech/docker-images/pull/1095 ## [25.3.0] - 2025-03-21 diff --git a/trino-storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch b/trino-storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 9513dbbc1..000000000 --- a/trino-storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4d6d55cbc2e05d9b64186885da86ac367070d0f1 Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Fri, 6 Sep 2024 17:53:52 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 6471642..fc0f376 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -555,6 +555,23 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - - diff --git a/trino-storage-connector/stackable/patches/455/patchable.toml b/trino-storage-connector/stackable/patches/455/patchable.toml deleted file mode 100644 index 094a7ef26..000000000 --- a/trino-storage-connector/stackable/patches/455/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -upstream = "https://github.com/snowlift/trino-storage.git" -base = "869a735d8be527117a19150e161ad8ca69317578" diff --git a/trino-storage-connector/versions.py b/trino-storage-connector/versions.py index 6c1ae45f1..6b5fc3674 100644 --- a/trino-storage-connector/versions.py +++ b/trino-storage-connector/versions.py @@ -3,10 +3,6 @@ "product": "451", "java-devel": "22", }, - { - "product": "455", - "java-devel": "22", - }, { "product": "470", "java-devel": "23", diff --git a/trino/stackable/patches/455/0001-Add-CycloneDX-plugin.patch b/trino/stackable/patches/455/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index b2a353922..000000000 --- a/trino/stackable/patches/455/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c91df97de99bfaf1d1740374170d6cb53e24b0af Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Fri, 6 Sep 2024 17:53:52 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 41ca1580021..f2ed3f54f40 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -2681,6 +2681,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ false -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - - diff --git a/trino/stackable/patches/455/patchable.toml b/trino/stackable/patches/455/patchable.toml deleted file mode 100644 index 39118758d..000000000 --- a/trino/stackable/patches/455/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -upstream = "https://github.com/trinodb/trino.git" -base = "e212460ea0aa663f0de9b16fecd480c4ad6490cc" diff --git a/trino/versions.py b/trino/versions.py index daaba71a9..85f0a5cc6 100644 --- a/trino/versions.py +++ b/trino/versions.py @@ -6,13 +6,6 @@ "jmx_exporter": "1.2.0", "trino-storage-connector": "451", }, - { - "product": "455", - "java-base": "22", - "java-devel": "22", - "jmx_exporter": "1.2.0", - "trino-storage-connector": "455", - }, { "product": "470", "java-base": "23", From f4ac4ee156011c4b847b83ee8e3a20fe578d0338 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 17:54:11 +0200 Subject: [PATCH 2/2] chore(trino): Add 476 --- CHANGELOG.md | 3 +++ trino-cli/versions.py | 4 ++-- trino-storage-connector/versions.py | 4 ++++ trino/versions.py | 7 +++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f35a518c3..1c1dfac0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ All notable changes to this project will be documented in this file. `check-permissions-ownership.sh` provided in stackable-base image ([#1053]). - trino: check for correct permissions and ownerships in /stackable folder via `check-permissions-ownership.sh` provided in stackable-base image ([#1025]). +- trino: Add `476` ([#1095]). +- trino-storage-connector: Add `476` ([#1095]). - zookeeper: check for correct permissions and ownerships in /stackable folder via `check-permissions-ownership.sh` provided in stackable-base image ([#1043]). @@ -41,6 +43,7 @@ All notable changes to this project will be documented in this file. - kubectl: Bump products to use `1.33.0` ([#1090]). - yq: Bump products to use `4.45.2` ([#1090]). - cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#1090]). +- trino-cli: Bump to `476` ([#1095]). ### Fixed diff --git a/trino-cli/versions.py b/trino-cli/versions.py index 164938849..828f6f625 100644 --- a/trino-cli/versions.py +++ b/trino-cli/versions.py @@ -2,7 +2,7 @@ # It's therefore ok if we only support a single version at a time. versions = [ { - "product": "470", - "java-base": "23", + "product": "476", + "java-base": "24", }, ] diff --git a/trino-storage-connector/versions.py b/trino-storage-connector/versions.py index 6b5fc3674..3c67dc2b3 100644 --- a/trino-storage-connector/versions.py +++ b/trino-storage-connector/versions.py @@ -7,4 +7,8 @@ "product": "470", "java-devel": "23", }, + { + "product": "476", + "java-devel": "24", + }, ] diff --git a/trino/versions.py b/trino/versions.py index 85f0a5cc6..9ca2d2597 100644 --- a/trino/versions.py +++ b/trino/versions.py @@ -13,4 +13,11 @@ "jmx_exporter": "1.2.0", "trino-storage-connector": "470", }, + { + "product": "476", + "java-base": "24", + "java-devel": "24", + "jmx_exporter": "1.2.0", + "trino-storage-connector": "476", + }, ]