From 33ade7e8c3d521f380deb9ef8a4ecbb7cd453313 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 10 Feb 2025 12:24:42 +0100 Subject: [PATCH 1/5] feat(trino): Replace 469 with 470 --- trino/stackable/patches/469/patchable.toml | 2 -- .../patches/{469 => 470}/0001-Add-cyclonedx-plugin.patch | 8 ++++---- trino/stackable/patches/470/patchable.toml | 2 ++ trino/versions.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 trino/stackable/patches/469/patchable.toml rename trino/stackable/patches/{469 => 470}/0001-Add-cyclonedx-plugin.patch (88%) create mode 100644 trino/stackable/patches/470/patchable.toml diff --git a/trino/stackable/patches/469/patchable.toml b/trino/stackable/patches/469/patchable.toml deleted file mode 100644 index 324f1b029..000000000 --- a/trino/stackable/patches/469/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -upstream = "https://github.com/trinodb/trino" -base = "39ef08e249549a6616916539f4ad21032d084c7a" diff --git a/trino/stackable/patches/469/0001-Add-cyclonedx-plugin.patch b/trino/stackable/patches/470/0001-Add-cyclonedx-plugin.patch similarity index 88% rename from trino/stackable/patches/469/0001-Add-cyclonedx-plugin.patch rename to trino/stackable/patches/470/0001-Add-cyclonedx-plugin.patch index bbd6eabd5..7c97791d4 100644 --- a/trino/stackable/patches/469/0001-Add-cyclonedx-plugin.patch +++ b/trino/stackable/patches/470/0001-Add-cyclonedx-plugin.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Larsen -Date: Tue, 4 Feb 2025 10:49:16 +0100 +Date: Mon, 10 Feb 2025 12:16:43 +0100 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 0d27151d77..b1682d7ab3 100644 +index a1604d5ebe..3f9f794504 100644 --- a/pom.xml +++ b/pom.xml -@@ -2850,6 +2850,24 @@ +@@ -2814,6 +2814,24 @@ @@ -37,7 +37,7 @@ index 0d27151d77..b1682d7ab3 100644 -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 new file mode 100644 index 000000000..840233beb --- /dev/null +++ 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 index 1aa1ec4bc..9205bd2dd 100644 --- 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", }, ] From b2db170121d499199d84f360267c3a3a2d740a8c Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 10 Feb 2025 12:24:52 +0100 Subject: [PATCH 2/5] feat(trino-cli): Replace 469 with 470 --- trino-cli/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trino-cli/versions.py b/trino-cli/versions.py index 57f242ea5..164938849 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": "469", + "product": "470", "java-base": "23", }, ] From 8c0577e3b0fb7f0e305b20dc8cd9affccd66cef7 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 10 Feb 2025 12:25:28 +0100 Subject: [PATCH 3/5] feat(trino-storage-connector): Replace 469 with 470 --- .../patches/{469 => 470}/0001-Add-cyclonedx-plugin.patch | 6 +++--- .../stackable/patches/{469 => 470}/patchable.toml | 2 +- trino-storage-connector/versions.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename trino-storage-connector/stackable/patches/{469 => 470}/0001-Add-cyclonedx-plugin.patch (90%) rename trino-storage-connector/stackable/patches/{469 => 470}/patchable.toml (52%) diff --git a/trino-storage-connector/stackable/patches/469/0001-Add-cyclonedx-plugin.patch b/trino-storage-connector/stackable/patches/470/0001-Add-cyclonedx-plugin.patch similarity index 90% rename from trino-storage-connector/stackable/patches/469/0001-Add-cyclonedx-plugin.patch rename to trino-storage-connector/stackable/patches/470/0001-Add-cyclonedx-plugin.patch index 1d3f74215..5cbb7e969 100644 --- a/trino-storage-connector/stackable/patches/469/0001-Add-cyclonedx-plugin.patch +++ b/trino-storage-connector/stackable/patches/470/0001-Add-cyclonedx-plugin.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Larsen -Date: Fri, 7 Feb 2025 12:32:20 +0100 +Date: Mon, 10 Feb 2025 12:20:07 +0100 Subject: Add cyclonedx plugin --- @@ -8,7 +8,7 @@ Subject: Add cyclonedx plugin 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 -base-commit: e2612ce1e2801211dc090bab32f28107b563a2ae +base-commit: 1b25d617940f14a844a43ee34aa705f7d11fbaf9 -- 2.40.1 diff --git a/trino-storage-connector/stackable/patches/469/patchable.toml b/trino-storage-connector/stackable/patches/470/patchable.toml similarity index 52% rename from trino-storage-connector/stackable/patches/469/patchable.toml rename to trino-storage-connector/stackable/patches/470/patchable.toml index 674e38e6d..8e4c218de 100644 --- a/trino-storage-connector/stackable/patches/469/patchable.toml +++ b/trino-storage-connector/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 index ceb6b0b4a..6c1ae45f1 100644 --- 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", }, ] From 8d1fc8461921723b5b02a97b2746f40b9bf7addd Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 10 Feb 2025 12:30:32 +0100 Subject: [PATCH 4/5] chore: Update changelog --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51350bcf6..b88ab7c79 100644 --- 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 From 7c19c916f6959fe4319b50954ba8cff8ff7f0a26 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 10 Feb 2025 12:48:12 +0100 Subject: [PATCH 5/5] chore: Update image-tools dependency for bake 0.0.14 --- nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index f9a6f291f..43572c80a 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": null, "owner": "stackabletech", "repo": "image-tools", - "rev": "104d3ad24eca5399977e9ae97b64235abac9c7c0", - "sha256": "1dg66jrsxam9m8z8v9fyr00hsd3rspma5lad9s8kbnyj71rq0rrw", + "rev": "3795a8727a724a59edf17a3f4061b734302ea7cd", + "sha256": "1x0n8cqsri7612asamk8ncfhh0xrk3khjjnfd80mzdhl9zk081nn", "type": "tarball", - "url": "https://github.com/stackabletech/image-tools/archive/104d3ad24eca5399977e9ae97b64235abac9c7c0.tar.gz", + "url": "https://github.com/stackabletech/image-tools/archive/3795a8727a724a59edf17a3f4061b734302ea7cd.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": {