From 2e0a0658a59eaa0fc29e41b8c290a3279760dede Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 29 Sep 2025 11:52:40 +0200
Subject: [PATCH 1/7] chore(trino): Add version 477

---
 CHANGELOG.md                                  |  2 +
 trino/boil-config.toml                        |  8 ++++
 trino/trino/boil-config.toml                  |  3 ++
 .../477/0001-Add-CycloneDX-plugin.patch       | 38 ++++++++++++++++
 ...ode-checking-because-flow-v0.241.0-f.patch | 44 +++++++++++++++++++
 .../stackable/patches/477/patchable.toml      |  2 +
 6 files changed, 97 insertions(+)
 create mode 100644 trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch
 create mode 100644 trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch
 create mode 100644 trino/trino/stackable/patches/477/patchable.toml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 009d97211..6d32eadcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 - opa: Add `1.8.0` ([#1279]).
 - spark: Add `3.5.7` ([#1280]).
 - spark-connect-client: Add `3.5.7` ([#1280]).
+- trino/trino-storage-connector: Add `477` ([#xxxx]).
 
 ### Changed
 
@@ -63,6 +64,7 @@ All notable changes to this project will be documented in this file.
 [#1278]: https://github.com/stackabletech/docker-images/pull/1278
 [#1279]: https://github.com/stackabletech/docker-images/pull/1279
 [#1283]: https://github.com/stackabletech/docker-images/pull/1283
+[#xxxx]: https://github.com/stackabletech/docker-images/pull/xxxx
 
 ## [25.7.0] - 2025-07-23
 
diff --git a/trino/boil-config.toml b/trino/boil-config.toml
index 60e3b2194..563a23b02 100644
--- a/trino/boil-config.toml
+++ b/trino/boil-config.toml
@@ -21,3 +21,11 @@ java-base = "24"
 
 [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"
diff --git a/trino/trino/boil-config.toml b/trino/trino/boil-config.toml
index 3b636f81b..5e41b085c 100644
--- a/trino/trino/boil-config.toml
+++ b/trino/trino/boil-config.toml
@@ -6,3 +6,6 @@ java-devel = "23"
 
 [versions."476".local-images]
 java-devel = "24"
+
+[versions."477".local-images]
+java-devel = "24"
diff --git a/trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch
new file mode 100644
index 000000000..bbe07e6b8
--- /dev/null
+++ b/trino/trino/stackable/patches/477/0001-Add-CycloneDX-plugin.patch
@@ -0,0 +1,38 @@
+From 4a1b94832a203be4b873f884d5c85ee4cbd809b7 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+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 be96a97de9..a4ace8ffd7 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -2853,6 +2853,24 @@
+                     </excludes>
+                 </configuration>
+             </plugin>
++            <plugin>
++                <groupId>org.cyclonedx</groupId>
++                <artifactId>cyclonedx-maven-plugin</artifactId>
++                <version>2.9.1</version>
++                <configuration>
++                    <projectType>application</projectType>
++                    <schemaVersion>1.6</schemaVersion>
++                    <skipNotDeployed>false</skipNotDeployed>
++                </configuration>
++                <executions>
++                    <execution>
++                        <goals>
++                            <goal>makeBom</goal>
++                        </goals>
++                        <phase>package</phase>
++                    </execution>
++                </executions>
++            </plugin>
+         </plugins>
+     </build>
+ 
diff --git a/trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch b/trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch
new file mode 100644
index 000000000..4cfff92da
--- /dev/null
+++ b/trino/trino/stackable/patches/477/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch
@@ -0,0 +1,44 @@
+From 5800f14ed19ffaafb7286b5b17639a5df806c1c6 Mon Sep 17 00:00:00 2001
+From: dervoeti <lukas.krug@stackable.tech>
+Date: Wed, 18 Jun 2025 14:05:10 +0200
+Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86
+ systems requires glibc 2.35, as of 2025-06-18 our UBI image comes with glibc
+ 2.34. This patch can likely be removed once we ship a newer version of glibc.
+
+---
+ core/trino-web-ui/pom.xml | 22 ----------------------
+ 1 file changed, 22 deletions(-)
+
+diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml
+index 471111f196..2c9eb56566 100644
+--- a/core/trino-web-ui/pom.xml
++++ b/core/trino-web-ui/pom.xml
+@@ -104,28 +104,6 @@
+                             <workingDirectory>src/main/resources/webapp/src</workingDirectory>
+                         </configuration>
+                     </execution>
+-                    <execution>
+-                        <id>check (webapp)</id>
+-                        <goals>
+-                            <goal>npm</goal>
+-                        </goals>
+-                        <phase>verify</phase>
+-                        <configuration>
+-                            <arguments>run ${frontend.check.goal}</arguments>
+-                            <workingDirectory>src/main/resources/webapp/src</workingDirectory>
+-                        </configuration>
+-                    </execution>
+-                    <execution>
+-                        <id>check (webapp-preview)</id>
+-                        <goals>
+-                            <goal>npm</goal>
+-                        </goals>
+-                        <phase>verify</phase>
+-                        <configuration>
+-                            <arguments>run ${frontend.check.goal}</arguments>
+-                            <workingDirectory>src/main/resources/webapp-preview</workingDirectory>
+-                        </configuration>
+-                    </execution>
+                     <execution>
+                         <id>package (webapp-preview)</id>
+                         <goals>
diff --git a/trino/trino/stackable/patches/477/patchable.toml b/trino/trino/stackable/patches/477/patchable.toml
new file mode 100644
index 000000000..f03258005
--- /dev/null
+++ b/trino/trino/stackable/patches/477/patchable.toml
@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/trino.git"
+base = "aec2d2a4f0f57a0a0c9d4aee3a1dd59fcb513438"

From d46f41dd2c5bdd2b5c9ebfb2eb94fd72c063d01e Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 29 Sep 2025 11:54:13 +0200
Subject: [PATCH 2/7] chore(trino/storage-connector): Add version 477

---
 trino/storage-connector/boil-config.toml      |  4 ++
 .../477/0001-Add-CycloneDX-plugin.patch       | 38 +++++++++++++++++++
 .../stackable/patches/477/patchable.toml      |  2 +
 3 files changed, 44 insertions(+)
 create mode 100644 trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch
 create mode 100644 trino/storage-connector/stackable/patches/477/patchable.toml

diff --git a/trino/storage-connector/boil-config.toml b/trino/storage-connector/boil-config.toml
index d7f57e826..b3fbd9c70 100644
--- a/trino/storage-connector/boil-config.toml
+++ b/trino/storage-connector/boil-config.toml
@@ -9,3 +9,7 @@ java-devel = "23"
 [versions."476".local-images]
 "trino/trino" = "476"
 java-devel = "24"
+
+[versions."477".local-images]
+"trino/trino" = "477"
+java-devel = "24"
diff --git a/trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch
new file mode 100644
index 000000000..8a5b224e1
--- /dev/null
+++ b/trino/storage-connector/stackable/patches/477/0001-Add-CycloneDX-plugin.patch
@@ -0,0 +1,38 @@
+From 1d1c65b91212273e7f016ee45705ff3bf766bc08 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+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 bc0bfe6..fe5443e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -605,6 +605,24 @@
+                     </dependency>
+                 </dependencies>
+             </plugin>
++            <plugin>
++                <groupId>org.cyclonedx</groupId>
++                <artifactId>cyclonedx-maven-plugin</artifactId>
++                <version>2.9.1</version>
++                <configuration>
++                    <projectType>application</projectType>
++                    <schemaVersion>1.6</schemaVersion>
++                    <skipNotDeployed>false</skipNotDeployed>
++                </configuration>
++                <executions>
++                    <execution>
++                        <goals>
++                            <goal>makeBom</goal>
++                        </goals>
++                        <phase>package</phase>
++                    </execution>
++                </executions>
++            </plugin>
+         </plugins>
+     </build>
+ </project>
diff --git a/trino/storage-connector/stackable/patches/477/patchable.toml b/trino/storage-connector/stackable/patches/477/patchable.toml
new file mode 100644
index 000000000..a36bfe77c
--- /dev/null
+++ b/trino/storage-connector/stackable/patches/477/patchable.toml
@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/trino-storage.git"
+base = "d3115d74556b240a38ee6fe2e0374f95bc037a86"

From 27eb3263547fee8b07c1d6a29f9aa41e15b32789 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 29 Sep 2025 11:58:16 +0200
Subject: [PATCH 3/7] chore(trino): Remove version 470

---
 CHANGELOG.md                                  |  3 +-
 trino/boil-config.toml                        |  8 ----
 trino/trino/boil-config.toml                  |  3 --
 .../470/0001-Add-CycloneDX-plugin.patch       | 38 ----------------
 ...ode-checking-because-flow-v0.241.0-f.patch | 44 -------------------
 .../stackable/patches/470/patchable.toml      |  2 -
 6 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
 delete mode 100644 trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch
 delete mode 100644 trino/trino/stackable/patches/470/patchable.toml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d32eadcb..9cf04be64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,8 @@ All notable changes to this project will be documented in this file.
 - opa: Remove `1.0.1` ([#1279]).
 - spark: Remove `3.5.5` ([#1280]).
 - spark-connect-client: Remove unused example script from the image ([#1280]).
-- kafka: Remove `3.9.0` ([#1283]). 
+- kafka: Remove `3.9.0` ([#1283]).
+- trino/trino-storage-conector: Remove `470` ([#xxxx]).
 
 [#1207]: https://github.com/stackabletech/docker-images/pull/1207
 [#1215]: https://github.com/stackabletech/docker-images/pull/1215
diff --git a/trino/boil-config.toml b/trino/boil-config.toml
index 563a23b02..206f75614 100644
--- a/trino/boil-config.toml
+++ b/trino/boil-config.toml
@@ -6,14 +6,6 @@ java-base = "22"
 [versions."451".build-arguments]
 jmx-exporter-version = "1.3.0"
 
-[versions."470".local-images]
-java-base = "23"
-"trino/trino" = "470"
-"trino/storage-connector" = "470"
-
-[versions."470".build-arguments]
-jmx-exporter-version = "1.3.0"
-
 [versions."476".local-images]
 java-base = "24"
 "trino/trino" = "476"
diff --git a/trino/trino/boil-config.toml b/trino/trino/boil-config.toml
index 5e41b085c..1b3da4be7 100644
--- a/trino/trino/boil-config.toml
+++ b/trino/trino/boil-config.toml
@@ -1,9 +1,6 @@
 [versions."451".local-images]
 java-devel = "22"
 
-[versions."470".local-images]
-java-devel = "23"
-
 [versions."476".local-images]
 java-devel = "24"
 
diff --git a/trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
deleted file mode 100644
index df8c3a293..000000000
--- a/trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 88bcb8d5ff689504f112b8b149a282a01e6b4212 Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <lukas.voetmand@stackable.tech>
-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 a1604d5ebe..3f9f794504 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -2814,6 +2814,24 @@
-                     </excludes>
-                 </configuration>
-             </plugin>
-+            <plugin>
-+                <groupId>org.cyclonedx</groupId>
-+                <artifactId>cyclonedx-maven-plugin</artifactId>
-+                <version>2.9.1</version>
-+                <configuration>
-+                    <projectType>application</projectType>
-+                    <schemaVersion>1.6</schemaVersion>
-+                    <skipNotDeployed>false</skipNotDeployed>
-+                </configuration>
-+                <executions>
-+                    <execution>
-+                        <goals>
-+                            <goal>makeBom</goal>
-+                        </goals>
-+                        <phase>package</phase>
-+                    </execution>
-+                </executions>
-+            </plugin>
-         </plugins>
-     </build>
- 
diff --git a/trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch b/trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch
deleted file mode 100644
index b6da7c4f1..000000000
--- a/trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1ec0bcdafe9f74f37b6e791e3df6b552ba748538 Mon Sep 17 00:00:00 2001
-From: dervoeti <lukas.krug@stackable.tech>
-Date: Wed, 18 Jun 2025 15:22:49 +0200
-Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86
- systems requires glibc 2.35, as of 2025-06-18 our UBI image comes with glibc
- 2.34. This patch can likely be removed once we ship a newer version of glibc.
-
----
- core/trino-web-ui/pom.xml | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml
-index d097a1e22f..98c7516af1 100644
---- a/core/trino-web-ui/pom.xml
-+++ b/core/trino-web-ui/pom.xml
-@@ -103,28 +103,6 @@
-                             <workingDirectory>src/main/resources/webapp/src</workingDirectory>
-                         </configuration>
-                     </execution>
--                    <execution>
--                        <id>check (webapp)</id>
--                        <goals>
--                            <goal>npm</goal>
--                        </goals>
--                        <phase>verify</phase>
--                        <configuration>
--                            <arguments>run ${frontend.check.goal}</arguments>
--                            <workingDirectory>src/main/resources/webapp/src</workingDirectory>
--                        </configuration>
--                    </execution>
--                    <execution>
--                        <id>check (webapp-preview)</id>
--                        <goals>
--                            <goal>npm</goal>
--                        </goals>
--                        <phase>verify</phase>
--                        <configuration>
--                            <arguments>run ${frontend.check.goal}</arguments>
--                            <workingDirectory>src/main/resources/webapp-preview</workingDirectory>
--                        </configuration>
--                    </execution>
-                     <execution>
-                         <id>package (webapp-preview)</id>
-                         <goals>
diff --git a/trino/trino/stackable/patches/470/patchable.toml b/trino/trino/stackable/patches/470/patchable.toml
deleted file mode 100644
index 640675696..000000000
--- a/trino/trino/stackable/patches/470/patchable.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"
-mirror = "https://github.com/stackabletech/trino.git"

From aea50a00749ba5964f9501dfce3f1aeaea6baa15 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 29 Sep 2025 11:58:47 +0200
Subject: [PATCH 4/7] chore(trino/storage-connector): Remove version 470

---
 trino/storage-connector/boil-config.toml      |  4 --
 .../470/0001-Add-CycloneDX-plugin.patch       | 38 -------------------
 .../stackable/patches/470/patchable.toml      |  2 -
 3 files changed, 44 deletions(-)
 delete mode 100644 trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
 delete mode 100644 trino/storage-connector/stackable/patches/470/patchable.toml

diff --git a/trino/storage-connector/boil-config.toml b/trino/storage-connector/boil-config.toml
index b3fbd9c70..e1dfd99f0 100644
--- a/trino/storage-connector/boil-config.toml
+++ b/trino/storage-connector/boil-config.toml
@@ -2,10 +2,6 @@
 "trino/trino" = "451"
 java-devel = "22"
 
-[versions."470".local-images]
-"trino/trino" = "470"
-java-devel = "23"
-
 [versions."476".local-images]
 "trino/trino" = "476"
 java-devel = "24"
diff --git a/trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
deleted file mode 100644
index 7e84ac8c0..000000000
--- a/trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3c2f4038b72ac3b62bc12c89d40d643a87796ee2 Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <lukas.voetmand@stackable.tech>
-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 ddd620e..62e60b5 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -545,6 +545,24 @@
-                     </dependency>
-                 </dependencies>
-             </plugin>
-+            <plugin>
-+                <groupId>org.cyclonedx</groupId>
-+                <artifactId>cyclonedx-maven-plugin</artifactId>
-+                <version>2.9.1</version>
-+                <configuration>
-+                    <projectType>application</projectType>
-+                    <schemaVersion>1.6</schemaVersion>
-+                    <skipNotDeployed>false</skipNotDeployed>
-+                </configuration>
-+                <executions>
-+                    <execution>
-+                        <goals>
-+                            <goal>makeBom</goal>
-+                        </goals>
-+                        <phase>package</phase>
-+                    </execution>
-+                </executions>
-+            </plugin>
-         </plugins>
-     </build>
- </project>
diff --git a/trino/storage-connector/stackable/patches/470/patchable.toml b/trino/storage-connector/stackable/patches/470/patchable.toml
deleted file mode 100644
index 039f4a39d..000000000
--- a/trino/storage-connector/stackable/patches/470/patchable.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"
-mirror = "https://github.com/stackabletech/trino-storage.git"

From d8c861754b11ec8d507c992193b7b9c0a6774fb8 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 29 Sep 2025 12:01:43 +0200
Subject: [PATCH 5/7] docs(patchable): Fix init command

---
 rust/patchable/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/patchable/README.md b/rust/patchable/README.md
index b83816a08..9b1334d1e 100644
--- a/rust/patchable/README.md
+++ b/rust/patchable/README.md
@@ -135,7 +135,7 @@ cargo patchable checkout druid 26.0.0
 
 # Tell Patchable about the new version 28.0.0, which can be fetched from
 # https://github.com/apache/druid.git, and has the tag druid-28.0.0
-cargo patchable init druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
+cargo patchable init version druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
 
 # Create and go to the worktree for the new version
 pushd $(cargo patchable checkout druid 28.0.0)

From 27822b9c9401a2fa5c09f41579683d27cf80ac8e Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 29 Sep 2025 14:25:00 +0200
Subject: [PATCH 6/7] chore(trino-cli): Bump version to 477

---
 CHANGELOG.md                          |  1 +
 trino-cli/Dockerfile                  |  7 ++++---
 trino-cli/boil-config.toml            |  2 +-
 trino-cli/upload_new_trino_version.sh | 27 +++++++++++----------------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cf04be64..176bfd3fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ All notable changes to this project will be documented in this file.
 - airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
 - druid: Deprecate `33.0.0` ([#1263]).
 - opa: Deprecate `1.4.2` ([#1279]).
+- trino-cli: Bump to 477 ([#xxxx]).
 
 ### Removed
 
diff --git a/trino-cli/Dockerfile b/trino-cli/Dockerfile
index 3c5d8b340..a98451f39 100644
--- a/trino-cli/Dockerfile
+++ b/trino-cli/Dockerfile
@@ -29,8 +29,9 @@ COPY --chown=${STACKABLE_USER_UID}:0 trino-cli/licenses /licenses
 WORKDIR /stackable/trino-cli
 
 RUN <<EOF
-curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}-executable.jar"
-ln -s "trino-cli-${PRODUCT_VERSION}-executable.jar" trino-cli-executable.jar
+curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}"
+chmod +x "trino-cli-${PRODUCT_VERSION}"
+ln -s "trino-cli-${PRODUCT_VERSION}" trino-cli
 
 # All files and folders owned by root group to support running as arbitrary users.
 # This is best practice as all container users will belong to the root group (0).
@@ -46,4 +47,4 @@ EOF
 # ----------------------------------------
 
 USER ${STACKABLE_USER_UID}
-ENTRYPOINT ["java", "-jar", "/stackable/trino-cli/trino-cli-executable.jar"]
+ENTRYPOINT ["/stackable/trino-cli/trino-cli"]
diff --git a/trino-cli/boil-config.toml b/trino-cli/boil-config.toml
index 4cf2f00c9..84b5de192 100644
--- a/trino-cli/boil-config.toml
+++ b/trino-cli/boil-config.toml
@@ -1,2 +1,2 @@
-[versions."476".local-images]
+[versions."477".local-images]
 java-base = "24"
diff --git a/trino-cli/upload_new_trino_version.sh b/trino-cli/upload_new_trino_version.sh
index fea3cf748..02a4b87e3 100755
--- a/trino-cli/upload_new_trino_version.sh
+++ b/trino-cli/upload_new_trino_version.sh
@@ -31,19 +31,16 @@ trap cleanup EXIT
 
 cd "$WORK_DIR" || exit
 
-bin_file=trino-cli-${VERSION}-executable.jar
-
-echo "Downloading Trino (this can take a while, it is intentionally downloading from a slow mirror that contains all old versions)"
-curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}"
-curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.asc"
-curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.sha1"
-
-# It is probably redundant to check both the checksum and the signature but it's cheap and why not
-echo "Validating SHA1 Checksum"
-if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
-  echo "ERROR: The SHA1 sum does not match"
-  exit 1
-fi
+echo "Downloading Trino"
+# Since Trno version 477, the CLI is only available as a GitHub release and not on Maven repository anymore.
+curl --fail -LO --progress-bar "https://github.com/trinodb/trino/releases/download/${VERSION}/trino-cli-${VERSION}"
+
+# The GitHub releases don't provide SHA1 checksums. That's why we currently don't validate the checksum.
+# echo "Validating SHA1 Checksum"
+# if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
+#   echo "ERROR: The SHA1 sum does not match"
+#   exit 1
+# fi
 
 # echo "Adding pinned public key for signature"
 # # We lock the public key here until trino has a better workflow for signing
@@ -89,9 +86,7 @@ fi
 
 echo "Uploading everything to Nexus"
 EXIT_STATUS=0
-curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
-curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}.asc" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
-curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}.sha1" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
+curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "trino-cli-${VERSION}" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
 
 if [ $EXIT_STATUS -ne 0 ]; then
   echo "ERROR: Upload failed"

From 182063ba2ede786850d021d249dbbfc37d0a1fa8 Mon Sep 17 00:00:00 2001
From: Techassi <sascha.lautenschlaeger@stackable.tech>
Date: Mon, 29 Sep 2025 16:32:46 +0200
Subject: [PATCH 7/7] chore: Apply suggestion

Co-authored-by: Malte Sander <malte.sander.it@gmail.com>
---
 trino-cli/upload_new_trino_version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trino-cli/upload_new_trino_version.sh b/trino-cli/upload_new_trino_version.sh
index 02a4b87e3..860958557 100755
--- a/trino-cli/upload_new_trino_version.sh
+++ b/trino-cli/upload_new_trino_version.sh
@@ -32,7 +32,7 @@ trap cleanup EXIT
 cd "$WORK_DIR" || exit
 
 echo "Downloading Trino"
-# Since Trno version 477, the CLI is only available as a GitHub release and not on Maven repository anymore.
+# Since Trino version 477, the CLI is only available as a GitHub release and not on Maven repository anymore.
 curl --fail -LO --progress-bar "https://github.com/trinodb/trino/releases/download/${VERSION}/trino-cli-${VERSION}"
 
 # The GitHub releases don't provide SHA1 checksums. That's why we currently don't validate the checksum.