chore(trino): Add 479, remove 451 and 476

CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - opensearch-dashboards: Add `3.4.0` ([#1392]).
 - testing-tools: build testing tools subimages in workflow ([#1366]).
 - kafka: Add `4.1.1` ([#1395]).
+- trino: Add `479` ([#1403]).
 
 ### Changed
 
@@ -25,6 +26,7 @@ All notable changes to this project will be documented in this file.
 - hive: fixed 4.0.1 shaded hive-metastore-opa-authorizer jar by relocating dependencies ([#1356]).
 - testing-tools: fix: add kubectl and openssl ([#1367]).
 - trino: Backport Kafka offset handling to 477 ([#1373]).
+- trino-cli: Bump to `479` ([#1403]).
 - ubi: Bumped ubi9 and ubi10 hashes ([#1386]).
 - vector: Bumped from 0.49.0 to 0.52.0 ([#1387]).
 
@@ -36,6 +38,7 @@ All notable changes to this project will be documented in this file.
 - kafka: Remove `3.7.2` and `4.1.0` ([#1395]).
 - opa: Remove `1.4.2` ([#1396]).
 - zookeeper: Remove `3.9.3` ([#1401]).
+- trino: Remove `451` and `476` ([#1403]).
 
 ### Fixed
 
@@ -64,6 +67,7 @@ All notable changes to this project will be documented in this file.
 [#1395]: https://github.com/stackabletech/docker-images/pull/1395
 [#1396]: https://github.com/stackabletech/docker-images/pull/1396
 [#1401]: https://github.com/stackabletech/docker-images/pull/1401
+[#1403]: https://github.com/stackabletech/docker-images/pull/1403
 [#1405]: https://github.com/stackabletech/docker-images/pull/1405
 
 ## [25.11.0] - 2025-11-07

java-base/boil-config.toml

@@ -10,11 +10,8 @@ vector = "0.52.0"
 [versions."21".local-images]
 vector = "0.52.0"
 
-[versions."22".local-images]
-vector = "0.52.0"
-
-[versions."23".local-images]
+[versions."24".local-images]
 vector = "0.52.0"
 
-[versions."24".local-images]
+[versions."25".local-images]
 vector = "0.52.0"

java-devel/boil-config.toml

@@ -10,11 +10,9 @@ stackable-devel = "1.0.0"
 [versions."21".local-images]
 stackable-devel = "1.0.0"
 
-[versions."22".local-images]
-stackable-devel = "1.0.0"
 
-[versions."23".local-images]
+[versions."24".local-images]
 stackable-devel = "1.0.0"
 
-[versions."24".local-images]
+[versions."25".local-images]
 stackable-devel = "1.0.0"

jdk-base/boil-config.toml

@@ -1,20 +1,6 @@
-[versions."8".local-images]
-vector = "0.52.0"
-
-[versions."11".local-images]
-vector = "0.52.0"
-
-[versions."17".local-images]
-vector = "0.52.0"
-
 [versions."21".local-images]
 vector = "0.52.0"
 
-[versions."22".local-images]
-vector = "0.52.0"
-
-[versions."23".local-images]
-vector = "0.52.0"
 
 [versions."24".local-images]
 vector = "0.52.0"

trino-cli/boil-config.toml

@@ -1,2 +1,2 @@
-[versions."477".local-images]
-java-base = "24"
+[versions."479".local-images]
+java-base = "25"

trino/Dockerfile

@@ -8,6 +8,7 @@ FROM local-image/trino/trino AS trino-builder
 FROM local-image/java-base
 
 ARG PRODUCT_VERSION
+ARG TRINO_STORAGE_CONNECTOR_VERSION
 ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 ARG JMX_EXPORTER_VERSION
@@ -38,9 +39,9 @@ EOF
 COPY --from=trino-builder --chown=${STACKABLE_USER_UID}:0 /stackable/trino-server /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 trino/licenses /licenses
 
-COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT_VERSION}/target/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
-COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT_VERSION}/target/bom.json /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
-COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/trino-storage-connector-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
+COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${TRINO_STORAGE_CONNECTOR_VERSION}/target/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION} /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}
+COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${TRINO_STORAGE_CONNECTOR_VERSION}/target/bom.json /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}/trino-storage-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}.cdx.json
+COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/trino-storage-connector-${TRINO_STORAGE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/jmx /stackable/jmx
 

trino/boil-config.toml

@@ -1,23 +1,17 @@
-[versions."451".local-images]
-java-base = "22"
-"trino/trino" = "451"
-"trino/storage-connector" = "451"
-
-[versions."451".build-arguments]
-jmx-exporter-version = "1.3.0"
-
-[versions."476".local-images]
-java-base = "24"
-"trino/trino" = "476"
-"trino/storage-connector" = "476"
-
-[versions."476".build-arguments]
-jmx-exporter-version = "1.3.0"
-
 [versions."477".local-images]
 java-base = "24"
 "trino/trino" = "477"
 "trino/storage-connector" = "477"
 
 [versions."477".build-arguments]
 jmx-exporter-version = "1.3.0"
+
+[versions."479".local-images]
+java-base = "25"
+"trino/trino" = "479"
+"trino/storage-connector" = "477"
+# There is no 479 connector yet
+# "trino/storage-connector" = "479"
+
+[versions."479".build-arguments]
+jmx-exporter-version = "1.3.0"

trino/storage-connector/boil-config.toml

@@ -1,11 +1,7 @@
-[versions."451".local-images]
-"trino/trino" = "451"
-java-devel = "22"
-
-[versions."476".local-images]
-"trino/trino" = "476"
-java-devel = "24"
-
 [versions."477".local-images]
 "trino/trino" = "477"
 java-devel = "24"
+
+[versions."479".local-images]
+"trino/trino" = "479"
+java-devel = "25"

trino/trino/boil-config.toml

@@ -1,8 +1,5 @@
-[versions."451".local-images]
-java-devel = "22"
-
-[versions."476".local-images]
-java-devel = "24"
-
 [versions."477".local-images]
 java-devel = "24"
+
+[versions."479".local-images]
+java-devel = "25"

trino/trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch → trino/trino/stackable/patches/479/0001-Add-CycloneDX-plugin.patch

@@ -1,4 +1,4 @@
-From 8391e69280bcdb675faf36ce1a259f0aceb2e022 Mon Sep 17 00:00:00 2001
+From 2656e41f8828cacc5622693cccc0b06eec4e76b8 Mon Sep 17 00:00:00 2001
 From: Lukas Voetmand <[email protected]>
 Date: Fri, 6 Sep 2024 17:53:52 +0200
 Subject: Add CycloneDX plugin
@@ -8,10 +8,10 @@ Subject: Add CycloneDX plugin
  1 file changed, 18 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index 579d46b764..8e2d10ec16 100644
+index 22256f87ea2..9275b9691cf 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -2834,6 +2834,24 @@
+@@ -2868,6 +2868,24 @@
                      </excludes>
                  </configuration>
              </plugin>

trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch → trino/trino/stackable/patches/479/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch

@@ -1,4 +1,4 @@
-From c69033a355820753a49772be984b9c735ce8b92d Mon Sep 17 00:00:00 2001
+From 403776233d76994d21fb76c5e3ea89e82afca44e Mon Sep 17 00:00:00 2001
 From: dervoeti <[email protected]>
 Date: Wed, 18 Jun 2025 14:05:10 +0200
 Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86
@@ -10,10 +10,10 @@ Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86
  1 file changed, 22 deletions(-)
 
 diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml
-index a783c8f989..bea233cfb9 100644
+index 565a5adf0c0..e172db8dabb 100644
 --- a/core/trino-web-ui/pom.xml
 +++ b/core/trino-web-ui/pom.xml
-@@ -103,28 +103,6 @@
+@@ -104,28 +104,6 @@
                              <workingDirectory>src/main/resources/webapp/src</workingDirectory>
                          </configuration>
                      </execution>

trino/trino/stackable/patches/451/patchable.toml → trino/trino/stackable/patches/479/patchable.toml

@@ -1,2 +1,2 @@
-base = "2c974f7cb1d71e1f9f466941a317190a474fc432"
 mirror = "https://github.com/stackabletech/trino.git"
+base = "1b3a3e39a657642b0c4f76a5439dae859f93b4b1"