From c92ff530256e9f8860a65d744d6a764c9fe52bbf Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 17:42:12 +0200 Subject: [PATCH 1/6] 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/6] 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", + }, ] From a3c45fd8337dd6d3fc2a60ff647afc07ba71293c Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 10:57:59 +0200 Subject: [PATCH 3/6] chore(trino): Patch 476 --- .../476/0001-Add-CycloneDX-plugin.patch | 38 +++++++++++++++++++ trino/stackable/patches/476/patchable.toml | 2 + .../476/0001-Add-CycloneDX-plugin.patch | 38 +++++++++++++++++++ .../stackable/patches/476/patchable.toml | 2 + 4 files changed, 80 insertions(+) create mode 100644 trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch create mode 100644 trino/stackable/patches/476/patchable.toml create mode 100644 trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch create mode 100644 trino/storage-connector/stackable/patches/476/patchable.toml diff --git a/trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch b/trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch new file mode 100644 index 000000000..52d992e1a --- /dev/null +++ b/trino/stackable/patches/476/0001-Add-CycloneDX-plugin.patch @@ -0,0 +1,38 @@ +From 8391e69280bcdb675faf36ce1a259f0aceb2e022 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 579d46b764..8e2d10ec16 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -2834,6 +2834,24 @@ + + + ++ ++ org.cyclonedx ++ cyclonedx-maven-plugin ++ 2.9.1 ++ ++ application ++ 1.6 ++ false ++ ++ ++ ++ ++ makeBom ++ ++ package ++ ++ ++ + + + diff --git a/trino/stackable/patches/476/patchable.toml b/trino/stackable/patches/476/patchable.toml new file mode 100644 index 000000000..33b736d43 --- /dev/null +++ b/trino/stackable/patches/476/patchable.toml @@ -0,0 +1,2 @@ +mirror = "https://github.com/stackabletech/trino.git" +base = "7f3746a7fa0b27ace2470340e848feaf3ee73f48" diff --git a/trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch new file mode 100644 index 000000000..7f70be73f --- /dev/null +++ b/trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch @@ -0,0 +1,38 @@ +From dd682ba1999455aefc683003cada4fe1677d909c 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 5433be6..c3f2fc7 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -584,6 +584,24 @@ + + + ++ ++ org.cyclonedx ++ cyclonedx-maven-plugin ++ 2.9.1 ++ ++ application ++ 1.6 ++ false ++ ++ ++ ++ ++ makeBom ++ ++ package ++ ++ ++ + + + diff --git a/trino/storage-connector/stackable/patches/476/patchable.toml b/trino/storage-connector/stackable/patches/476/patchable.toml new file mode 100644 index 000000000..0358fea9f --- /dev/null +++ b/trino/storage-connector/stackable/patches/476/patchable.toml @@ -0,0 +1,2 @@ +mirror = "https://github.com/stackabletech/trino-storage.git" +base = "1729ac627e9d5549f414c64060bee0c0d97fde01" From 683a028e8731ca597fd3efb67fa34998b2d160ae Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 14:49:00 +0200 Subject: [PATCH 4/6] fix(trino): Use correct reference to storage-connector --- trino/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trino/versions.py b/trino/versions.py index c849f938e..97d90abbe 100644 --- a/trino/versions.py +++ b/trino/versions.py @@ -18,6 +18,6 @@ "java-base": "24", "java-devel": "24", "jmx_exporter": "1.2.0", - "trino-storage-connector": "476", + "trino/storage-connector": "476", }, ] From 893af7a92b033c4f7d3fbd9587b3eca7150d5afc Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 14:54:42 +0200 Subject: [PATCH 5/6] fix(trino): Selectively skip projects by version Also remove the git hack for patchable and instead skip gitcommitid like we do for druid and rearrange the command into multiple lines with additional skips --- trino/Dockerfile | 28 ++++++++++++++-------------- trino/storage-connector/Dockerfile | 10 +++++++++- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/trino/Dockerfile b/trino/Dockerfile index 8b49196ef..dd68508a8 100644 --- a/trino/Dockerfile +++ b/trino/Dockerfile @@ -27,22 +27,22 @@ cd "$(/stackable/patchable --images-repo-root=src checkout trino ${PRODUCT})" # Create snapshot of the source code including custom patches tar -czf /stackable/trino-${PRODUCT}-src.tar.gz . -# Trino is using something (git-commit-id-plugin in the past, maybe something else now) that is -# reading the Git history and searches for a tag to pull the version from. It sounds weird to me -# why someone would do that over just picking the version from the pom.xml, but they propably -# have their reasons. See e.g. https://github.com/trinodb/trino/discussions/18963. -# So we fake it till we make it and create a Git repo and the correct tag. The trino-operator -# smoke test checks that "select version()" is working. -# Also, we need to initialize a new Git repo because `git-commit-id-maven-plugin` has a problem with worktrees, see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/215 -rm .git -git init -git config user.email "fake.commiter@stackable.tech" -git config user.name "Fake commiter" -git commit --allow-empty --message "Fake commit, so that we can create a tag" -git tag ${PRODUCT} +SKIP_PROJECTS="!docs" +if [ "$PRODUCT" = "470" ] || [ "$PRODUCT" = "451" ]; then + SKIP_PROJECTS="$SKIP_PROJECTS,!core/trino-server-rpm" +fi # We need to use ./mvnw instead of mvn to get a recent maven version (which is required to build Trino) -./mvnw --batch-mode --no-transfer-progress package -DskipTests --projects="!docs,!core/trino-server-rpm" +./mvnw \ + --batch-mode \ + --no-transfer-progress \ + package \ + `# -Dmaven.test.skip # Unable to skip test compilation without an unused dependency error for software.amazon.awssdk:identity-spi` \ + -DskipTests `# Skip test execution` \ + -Dcheckstyle.skip `# Skip checkstyle checks. We dont care if the code is properly formatted, it just wastes time` \ + -Dmaven.javadoc.skip=true `# Dont generate javadoc` \ + -Dmaven.gitcommitid.skip=true `# The gitcommitid plugin cannot work with git workspaces (ie: patchable)` \ + --projects="$SKIP_PROJECTS" # Delete intermediate build products to free some space and keep runners happy rm -r plugin/*/target core/trino-server/target/trino-server-${PRODUCT} diff --git a/trino/storage-connector/Dockerfile b/trino/storage-connector/Dockerfile index f3e00efc9..3baf55a0f 100644 --- a/trino/storage-connector/Dockerfile +++ b/trino/storage-connector/Dockerfile @@ -23,5 +23,13 @@ tar -czf /stackable/trino-storage-connector-${PRODUCT}-src.tar.gz . mvn versions:set -DnewVersion=${PRODUCT} # We need to use ./mvnw instead of mvn to get a recent maven version (which is required to build Trino) -./mvnw --batch-mode --no-transfer-progress package -DskipTests -Dmaven.gitcommitid.skip=true +./mvnw \ + --batch-mode \ + --no-transfer-progress \ + package \ + -Dmaven.test.skip `# Skip test compilation` \ + -DskipTests `# Skip test execution` \ + -Dcheckstyle.skip `# Skip checkstyle checks. We dont care if the code is properly formatted, it just wastes time` \ + -Dmaven.javadoc.skip=true `# Dont generate javadoc` \ + -Dmaven.gitcommitid.skip=true `# The gitcommitid plugin cannot work with git workspaces (ie: patchable)` EOF From 9f8acd042ba556b513bc30a3bb864043e403ea02 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 15:11:05 +0200 Subject: [PATCH 6/6] chore(trino): Update the instructions in the issue template --- .github/ISSUE_TEMPLATE/update-product-trino.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/update-product-trino.md b/.github/ISSUE_TEMPLATE/update-product-trino.md index 8f3683380..64ee237f0 100644 --- a/.github/ISSUE_TEMPLATE/update-product-trino.md +++ b/.github/ISSUE_TEMPLATE/update-product-trino.md @@ -30,7 +30,6 @@ Add/Change/Remove anything that isn't applicable anymore ### Trino - [ ] Update `versions.py` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions). -- [ ] Upload new version (see `trino/*.sh` scripts). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: jmx_exporter, opa_authorizer, storage_connector, etc). - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.