stackabletech · NickLarsenNZ · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 
@@ -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
 
@@ -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
 

diff --git a/nix/sources.json b/nix/sources.json
diff --git 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": "469",
+        "product": "470",
         "java-base": "23",
     },
 ]
diff --git a/...tches/469/0001-Add-cyclonedx-plugin.patch → ...tches/470/0001-Add-cyclonedx-plugin.patch b/...tches/469/0001-Add-cyclonedx-plugin.patch → ...tches/470/0001-Add-cyclonedx-plugin.patch
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nick Larsen <[email protected]>
-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 @@
@@ -36,7 +36,7 @@ index 2176aba..91e9197 100644
      </build>
  </project>
 
-base-commit: e2612ce1e2801211dc090bab32f28107b563a2ae
+base-commit: 1b25d617940f14a844a43ee34aa705f7d11fbaf9
 -- 
 2.40.1
 
diff --git a/...ctor/stackable/patches/469/patchable.toml → ...ctor/stackable/patches/470/patchable.toml b/...ctor/stackable/patches/469/patchable.toml → ...ctor/stackable/patches/470/patchable.toml
@@ -1,2 +1,2 @@
 upstream = "https://github.com/snowlift/trino-storage"
-base = "e2612ce1e2801211dc090bab32f28107b563a2ae"
+base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"
diff --git a/trino-storage-connector/versions.py b/trino-storage-connector/versions.py
@@ -8,7 +8,7 @@
         "java-devel": "22",
     },
     {
-        "product": "469",
+        "product": "470",
         "java-devel": "23",
     },
 ]
diff --git a/trino/stackable/patches/469/patchable.toml b/trino/stackable/patches/469/patchable.toml
diff --git a/...tches/469/0001-Add-cyclonedx-plugin.patch → ...tches/470/0001-Add-cyclonedx-plugin.patch b/...tches/469/0001-Add-cyclonedx-plugin.patch → ...tches/470/0001-Add-cyclonedx-plugin.patch
@@ -1,17 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nick Larsen <[email protected]>
-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>
@@ -37,7 +37,7 @@ index 0d27151d77..b1682d7ab3 100644
      </build>
 
 
-base-commit: 39ef08e249549a6616916539f4ad21032d084c7a
+base-commit: 05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf
 -- 
 2.40.1
 
diff --git a/trino/stackable/patches/470/patchable.toml b/trino/stackable/patches/470/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/trinodb/trino"
+base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"
diff --git a/trino/versions.py b/trino/versions.py
@@ -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",
     },
 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		upstream = "https://github.com/trinodb/trino"
		base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"