chore(trino): Bump trino ahead of 25.7.0

CHANGELOG.md

@@ -37,6 +37,8 @@ All notable changes to this project will be documented in this file.
 - superset: Add version `4.1.2` ([#1102]).
 - 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]).
 - nifi: Build and add OPA authorizer plugin nar ([#1058]).
@@ -65,6 +67,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]).
 - vector: Bump to `0.46.1` ([#1098]).
 - spark: update dependencies for 3.5.5 ([#1094])
 - nifi: include NAR SBOMs ([#1119])
@@ -103,6 +106,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]).
 - zookeeper: Remove 3.9.2 ([#1093]).
 - Remove ubi8-rust-builder image ([#1091]).
 - spark: remove 3.5.2 ([#1094])
@@ -141,6 +146,7 @@ All notable changes to this project will be documented in this file.
 [#1091]: https://github.com/stackabletech/docker-images/pull/1091
 [#1093]: https://github.com/stackabletech/docker-images/pull/1093
 [#1094]: https://github.com/stackabletech/docker-images/pull/1094
+[#1095]: https://github.com/stackabletech/docker-images/pull/1095
 [#1097]: https://github.com/stackabletech/docker-images/pull/1097
 [#1098]: https://github.com/stackabletech/docker-images/pull/1098
 [#1099]: https://github.com/stackabletech/docker-images/pull/1099

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",
     },
 ]

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 "[email protected]"
-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}

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

@@ -1,4 +1,4 @@
-From c91df97de99bfaf1d1740374170d6cb53e24b0af Mon Sep 17 00:00:00 2001
+From 8391e69280bcdb675faf36ce1a259f0aceb2e022 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,20 +8,20 @@ Subject: Add CycloneDX plugin
  1 file changed, 18 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index 41ca1580021..f2ed3f54f40 100644
+index 579d46b764..8e2d10ec16 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -2681,6 +2681,24 @@
+@@ -2834,6 +2834,24 @@
                      </excludes>
                  </configuration>
              </plugin>
 +            <plugin>
 +                <groupId>org.cyclonedx</groupId>
 +                <artifactId>cyclonedx-maven-plugin</artifactId>
-+                <version>2.8.0</version>
++                <version>2.9.1</version>
 +                <configuration>
 +                    <projectType>application</projectType>
-+                    <schemaVersion>1.5</schemaVersion>
++                    <schemaVersion>1.6</schemaVersion>
 +                    <skipNotDeployed>false</skipNotDeployed>
 +                </configuration>
 +                <executions>

trino/stackable/patches/455/patchable.toml → trino/stackable/patches/476/patchable.toml

@@ -1,2 +1,2 @@
-base = "e212460ea0aa663f0de9b16fecd480c4ad6490cc"
 mirror = "https://github.com/stackabletech/trino.git"
+base = "7f3746a7fa0b27ace2470340e848feaf3ee73f48"

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

trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch → trino/storage-connector/stackable/patches/476/0001-Add-CycloneDX-plugin.patch

@@ -1,4 +1,4 @@
-From c14ba9cd92451a2c8a7ad7da2ff2e3f5cdbf2201 Mon Sep 17 00:00:00 2001
+From dd682ba1999455aefc683003cada4fe1677d909c 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,20 +8,20 @@ Subject: Add CycloneDX plugin
  1 file changed, 18 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index 7304dac..d73dacf 100644
+index 5433be6..c3f2fc7 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -544,6 +544,24 @@
+@@ -584,6 +584,24 @@
                      </dependency>
                  </dependencies>
              </plugin>
 +            <plugin>
 +                <groupId>org.cyclonedx</groupId>
 +                <artifactId>cyclonedx-maven-plugin</artifactId>
-+                <version>2.8.0</version>
++                <version>2.9.1</version>
 +                <configuration>
 +                    <projectType>application</projectType>
-+                    <schemaVersion>1.5</schemaVersion>
++                    <schemaVersion>1.6</schemaVersion>
 +                    <skipNotDeployed>false</skipNotDeployed>
 +                </configuration>
 +                <executions>

trino/storage-connector/stackable/patches/455/patchable.toml → trino/storage-connector/stackable/patches/476/patchable.toml

@@ -1,2 +1,2 @@
-base = "869a735d8be527117a19150e161ad8ca69317578"
 mirror = "https://github.com/stackabletech/trino-storage.git"
+base = "1729ac627e9d5549f414c64060bee0c0d97fde01"

trino/storage-connector/versions.py

@@ -3,12 +3,12 @@
         "product": "451",
         "java-devel": "22",
     },
-    {
-        "product": "455",
-        "java-devel": "22",
-    },
     {
         "product": "470",
         "java-devel": "23",
     },
+    {
+        "product": "476",
+        "java-devel": "24",
+    },
 ]

trino/versions.py

@@ -6,18 +6,18 @@
         "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",
         "java-devel": "23",
         "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",
+    },
 ]