WIP Trino 475 (with storage connector 474)

Author: sbernauer

trino-storage-connector/stackable/patches/474/0001-Add-CycloneDX-plugin.patch

@@ -0,0 +1,37 @@
+From 1f5f2f18056f650b89f0399c188e3446975e1764 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
+
+---
+ pom.xml | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index ddd620e..bbfcb96 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -545,6 +545,23 @@
+                     </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>
++                </configuration>
++                <executions>
++                    <execution>
++                        <goals>
++                            <goal>makeBom</goal>
++                        </goals>
++                        <phase>package</phase>
++                    </execution>
++                </executions>
++            </plugin>
+         </plugins>
+     </build>
+ </project>

trino-storage-connector/stackable/patches/474/patchable.toml

@@ -0,0 +1,2 @@
+upstream = "https://github.com/snowlift/trino-storage.git"
+base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"

trino-storage-connector/versions.py

@@ -11,4 +11,8 @@
         "product": "470",
         "java-devel": "23",
     },
+    {
+        "product": "474",
+        "java-devel": "23",
+    },
 ]

trino/Dockerfile

@@ -6,6 +6,7 @@ FROM stackable/image/trino-storage-connector AS trino-storage-connector-image
 FROM stackable/image/java-devel AS trino-builder
 
 ARG PRODUCT
+ARG TRINO_STORAGE_CONNECTOR
 ARG STACKABLE_USER_UID
 ARG JMX_EXPORTER
 
@@ -26,8 +27,8 @@ RUN curl "https://repo.stackable.tech/repository/packages/trino-server/trino-ser
 
 COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/apply_patches.sh /stackable/trino-server-${PRODUCT}-src/patches/apply_patches.sh
 COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/${PRODUCT} /stackable/trino-server-${PRODUCT}-src/patches/${PRODUCT}
-COPY --chown=${STACKABLE_USER_UID}:0 --from=trino-storage-connector-image /stackable/trino-storage-${PRODUCT}-src/target/trino-storage-${PRODUCT} \
-    /stackable/trino-server-${PRODUCT}/plugin/trino-storage-${PRODUCT}/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=trino-storage-connector-image /stackable/trino-storage-${TRINO_STORAGE_CONNECTOR}-src/target/trino-storage-${TRINO_STORAGE_CONNECTOR} \
+    /stackable/trino-server-${PRODUCT}/plugin/trino-storage-${TRINO_STORAGE_CONNECTOR}/
 COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/jmx /stackable/jmx
 
 # adding a hadolint ignore for SC2215, due to https://github.com/hadolint/hadolint/issues/980
@@ -49,7 +50,12 @@ git commit --allow-empty --message "Fake commit, so that we can create a tag"
 git tag ${PRODUCT}
 
 # We need to use ./mvnw instead of mvn to get a recent maven version (which is required to build Trino)
+# trino-server-rpm was removed at some point of time
+if [[ "$PRODUCT" == "451" || "$PRODUCT" == "455" || "$PRODUCT" == "470" ]]; then
 ./mvnw --batch-mode --no-transfer-progress package -DskipTests --projects="!docs,!core/trino-server-rpm"
+else
+./mvnw --batch-mode --no-transfer-progress package -DskipTests --projects="!docs"
+fi
 
 # Delete intermediate build products to free some space and keep runners happy
 rm -r /stackable/trino-server-${PRODUCT}-src/plugin/*/target /stackable/trino-server-${PRODUCT}-src/core/trino-server/target/trino-server-${PRODUCT}

trino/stackable/patches/475/0001-Add-CycloneDX-plugin.patch

@@ -0,0 +1,38 @@
+From 88bcb8d5ff689504f112b8b149a282a01e6b4212 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
+
+---
+ pom.xml | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index a1604d5ebec..3f9f7945046 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>
+ 

trino/stackable/patches/475/patchable.toml

@@ -0,0 +1,2 @@
+upstream = "https://github.com/trinodb/trino.git"
+base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"

trino/versions.py

@@ -5,19 +5,30 @@
         "java-devel": "22",
         "jmx_exporter": "1.1.0",
         "trino-storage-connector": "451",
+        "trino_storage_connector": "451",
     },
     {
         "product": "455",
         "java-base": "22",
         "java-devel": "22",
         "jmx_exporter": "1.1.0",
         "trino-storage-connector": "455",
+        "trino_storage_connector": "455",
     },
     {
         "product": "470",
         "java-base": "23",
         "java-devel": "23",
         "jmx_exporter": "1.1.0",
         "trino-storage-connector": "470",
+        "trino_storage_connector": "470",
+    },
+    {
+        "product": "475",
+        "java-base": "23",
+        "java-devel": "23",
+        "jmx_exporter": "1.1.0",
+        "trino-storage-connector": "474",
+        "trino_storage_connector": "474",
     },
 ]