From 7f7f29b9ac27d45485c07ba09e434ee74867b401 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Fri, 7 Feb 2025 10:38:34 +0100
Subject: [PATCH 1/5] fix(trino): Restore trino-storage patches

---
 .../451/001-cyclonedx-plugin.patch            | 28 +++++++++++++++++++
 .../455/001-cyclonedx-plugin.patch            | 28 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch
 create mode 100644 trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch

diff --git a/trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch b/trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch
new file mode 100644
index 000000000..390ae15b1
--- /dev/null
+++ b/trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch
@@ -0,0 +1,28 @@
+diff --git a/pom.xml b/pom.xml
+index 7304dac..5ba854d 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -544,6 +544,23 @@
+                     </dependency>
+                 </dependencies>
+             </plugin>
++            <plugin>
++                <groupId>org.cyclonedx</groupId>
++                <artifactId>cyclonedx-maven-plugin</artifactId>
++                <version>2.8.0</version>
++                <configuration>
++                    <projectType>application</projectType>
++                    <schemaVersion>1.5</schemaVersion>
++                </configuration>
++                <executions>
++                    <execution>
++                        <goals>
++                            <goal>makeBom</goal>
++                        </goals>
++                        <phase>package</phase>
++                    </execution>
++                </executions>
++            </plugin>
+         </plugins>
+     </build>
+ </project>
diff --git a/trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch b/trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch
new file mode 100644
index 000000000..387997d5d
--- /dev/null
+++ b/trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch
@@ -0,0 +1,28 @@
+diff --git a/pom.xml b/pom.xml
+index 6471642..fc0f376 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -555,6 +555,23 @@
+                     </dependency>
+                 </dependencies>
+             </plugin>
++            <plugin>
++                <groupId>org.cyclonedx</groupId>
++                <artifactId>cyclonedx-maven-plugin</artifactId>
++                <version>2.8.0</version>
++                <configuration>
++                    <projectType>application</projectType>
++                    <schemaVersion>1.5</schemaVersion>
++                </configuration>
++                <executions>
++                    <execution>
++                        <goals>
++                            <goal>makeBom</goal>
++                        </goals>
++                        <phase>package</phase>
++                    </execution>
++                </executions>
++            </plugin>
+         </plugins>
+     </build>
+ </project>

From 2bd4a5214bc7baf7a287b6a61ac8ca90c75b9ed0 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Fri, 7 Feb 2025 12:27:48 +0100
Subject: [PATCH 2/5] chore(trino): Split trino-storage-connector into separate
 build for easier patching with patchable

---
 conf.py                                       |   4 +-
 trino-storage-connector/Dockerfile            |  37 ++++
 .../licenses/SNOWLIFT_TRINO_STORAGE_LICENSE   | 201 ++++++++++++++++++
 .../licenses/STACKABLE_LICENSE                |  43 ++++
 .../patches}/451/001-cyclonedx-plugin.patch   |   0
 .../patches}/455/001-cyclonedx-plugin.patch   |   0
 .../stackable/patches/apply_patches.sh        |  44 ++++
 .../upload_new_trino_storage_version.sh       |   0
 trino-storage-connector/versions.py           |  14 ++
 trino/Dockerfile                              |  39 +---
 trino/versions.py                             |   6 +-
 11 files changed, 347 insertions(+), 41 deletions(-)
 create mode 100644 trino-storage-connector/Dockerfile
 create mode 100644 trino-storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE
 create mode 100644 trino-storage-connector/licenses/STACKABLE_LICENSE
 rename {trino/stackable/patches/trino-storage => trino-storage-connector/stackable/patches}/451/001-cyclonedx-plugin.patch (100%)
 rename {trino/stackable/patches/trino-storage => trino-storage-connector/stackable/patches}/455/001-cyclonedx-plugin.patch (100%)
 create mode 100755 trino-storage-connector/stackable/patches/apply_patches.sh
 rename {trino => trino-storage-connector}/upload_new_trino_storage_version.sh (100%)
 create mode 100644 trino-storage-connector/versions.py

diff --git a/conf.py b/conf.py
index 23c5e54ce..e863dd145 100644
--- a/conf.py
+++ b/conf.py
@@ -29,6 +29,7 @@
 superset = importlib.import_module("superset.versions")
 trino_cli = importlib.import_module("trino-cli.versions")
 trino = importlib.import_module("trino.versions")
+trino_storage_connector = importlib.import_module("trino-storage-connector.versions")
 kafka_testing_tools = importlib.import_module("kafka-testing-tools.versions")
 kcat = importlib.import_module("kcat.versions")
 testing_tools = importlib.import_module("testing-tools.versions")
@@ -56,6 +57,7 @@
     {"name": "superset", "versions": superset.versions},
     {"name": "trino-cli", "versions": trino_cli.versions},
     {"name": "trino", "versions": trino.versions},
+    {"name": "trino-storage-connector", "versions": trino_storage_connector.versions},
     {"name": "kafka-testing-tools", "versions": kafka_testing_tools.versions},
     {"name": "kcat", "versions": kcat.versions},
     {"name": "testing-tools", "versions": testing_tools.versions},
@@ -94,5 +96,5 @@
     "STACKABLE_USER_NAME": "stackable",
     "STACKABLE_USER_UID": "1000",
     "STACKABLE_USER_GID": "1000",
-    "DELETE_CACHES": "true"
+    "DELETE_CACHES": "true",
 }
diff --git a/trino-storage-connector/Dockerfile b/trino-storage-connector/Dockerfile
new file mode 100644
index 000000000..5b92551b6
--- /dev/null
+++ b/trino-storage-connector/Dockerfile
@@ -0,0 +1,37 @@
+# syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
+# check=error=true
+
+FROM stackable/image/java-devel AS storage-connector-builder
+
+ARG PRODUCT
+ARG STACKABLE_USER_UID
+
+RUN <<EOF
+microdnf update
+
+# patch: Required for the apply-patches.sh script
+microdnf install \
+patch
+
+microdnf clean all
+rm -rf /var/cache/yum
+EOF
+
+WORKDIR /stackable
+
+COPY --chown=${STACKABLE_USER_UID}:0 trino-storage-connector/stackable/patches/apply_patches.sh /stackable/trino-storage-${PRODUCT}-src/patches/apply_patches.sh
+COPY --chown=${STACKABLE_USER_UID}:0 trino-storage-connector/stackable/patches/${PRODUCT} /stackable/trino-storage-${PRODUCT}-src/patches/${PRODUCT}
+
+RUN curl "https://repo.stackable.tech/repository/packages/trino-storage/trino-storage-${PRODUCT}-src.tar.gz" | tar -xzC .
+# adding a hadolint ignore for SC2215, due to https://github.com/hadolint/hadolint/issues/980
+# hadolint ignore=SC2215
+RUN --mount=type=cache,id=maven-${PRODUCT},target=/root/.m2/repository <<EOF
+cd trino-storage-${PRODUCT}-src
+./patches/apply_patches.sh ${PRODUCT}
+
+# Upstream builds are marked as -SNAPSHOT, even for release builds
+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
+EOF
diff --git a/trino-storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE b/trino-storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE
new file mode 100644
index 000000000..261eeb9e9
--- /dev/null
+++ b/trino-storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/trino-storage-connector/licenses/STACKABLE_LICENSE b/trino-storage-connector/licenses/STACKABLE_LICENSE
new file mode 100644
index 000000000..1b9535c9e
--- /dev/null
+++ b/trino-storage-connector/licenses/STACKABLE_LICENSE
@@ -0,0 +1,43 @@
+Licensed under the Open Software License version 3.0
+
+1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+a) to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+c) to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+d) to perform the Original Work publicly; and
+
+e) to display the Original Work publicly.
+
+2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch b/trino-storage-connector/stackable/patches/451/001-cyclonedx-plugin.patch
similarity index 100%
rename from trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch
rename to trino-storage-connector/stackable/patches/451/001-cyclonedx-plugin.patch
diff --git a/trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch b/trino-storage-connector/stackable/patches/455/001-cyclonedx-plugin.patch
similarity index 100%
rename from trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch
rename to trino-storage-connector/stackable/patches/455/001-cyclonedx-plugin.patch
diff --git a/trino-storage-connector/stackable/patches/apply_patches.sh b/trino-storage-connector/stackable/patches/apply_patches.sh
new file mode 100755
index 000000000..833b3e9c7
--- /dev/null
+++ b/trino-storage-connector/stackable/patches/apply_patches.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# Enable error handling and unset variable checking
+set -eu
+set -o pipefail
+
+# Check if $1 (VERSION) is provided
+if [ -z "${1-}" ]; then
+  echo "Please provide a value for VERSION as the first argument."
+  exit 1
+fi
+
+VERSION="$1"
+PATCH_DIR="patches/$VERSION"
+
+# Check if version-specific patches directory exists
+if [ ! -d "$PATCH_DIR" ]; then
+  echo "Patches directory '$PATCH_DIR' does not exist."
+  exit 1
+fi
+
+# Create an array to hold the patches in sorted order
+declare -a patch_files=()
+
+echo "Applying patches from ${PATCH_DIR}" now
+
+# Read the patch files into the array
+while IFS= read -r -d $'\0' file; do
+  patch_files+=("$file")
+done < <(find "$PATCH_DIR" -name "*.patch" -print0 | sort -zV)
+
+echo "Found ${#patch_files[@]} patches, applying now"
+
+# Iterate through sorted patch files
+for patch_file in "${patch_files[@]}"; do
+  echo "Applying $patch_file"
+  # We can not use Git here, as we are not within a Git repo
+  patch --directory "." --strip=1 < "$patch_file" || {
+    echo "Failed to apply $patch_file"
+    exit 1
+  }
+done
+
+echo "All patches applied successfully."
diff --git a/trino/upload_new_trino_storage_version.sh b/trino-storage-connector/upload_new_trino_storage_version.sh
similarity index 100%
rename from trino/upload_new_trino_storage_version.sh
rename to trino-storage-connector/upload_new_trino_storage_version.sh
diff --git a/trino-storage-connector/versions.py b/trino-storage-connector/versions.py
new file mode 100644
index 000000000..ceb6b0b4a
--- /dev/null
+++ b/trino-storage-connector/versions.py
@@ -0,0 +1,14 @@
+versions = [
+    {
+        "product": "451",
+        "java-devel": "22",
+    },
+    {
+        "product": "455",
+        "java-devel": "22",
+    },
+    {
+        "product": "469",
+        "java-devel": "23",
+    },
+]
diff --git a/trino/Dockerfile b/trino/Dockerfile
index 68383bdbd..eb15b1469 100644
--- a/trino/Dockerfile
+++ b/trino/Dockerfile
@@ -1,45 +1,11 @@
 # syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
 # check=error=true
 
-FROM stackable/image/java-devel AS storage-connector-builder
-
-ARG STORAGE_CONNECTOR
-ARG STACKABLE_USER_UID
-
-RUN <<EOF
-microdnf update
-
-# patch: Required for the apply-patches.sh script
-microdnf install \
-patch
-
-microdnf clean all
-rm -rf /var/cache/yum
-EOF
-
-WORKDIR /stackable
-
-COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/apply_patches.sh /stackable/trino-storage-${STORAGE_CONNECTOR}-src/patches/apply_patches.sh
-COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/trino-storage/${STORAGE_CONNECTOR} /stackable/trino-storage-${STORAGE_CONNECTOR}-src/patches/${STORAGE_CONNECTOR}
-
-RUN curl "https://repo.stackable.tech/repository/packages/trino-storage/trino-storage-${STORAGE_CONNECTOR}-src.tar.gz" | tar -xzC .
-# adding a hadolint ignore for SC2215, due to https://github.com/hadolint/hadolint/issues/980
-# hadolint ignore=SC2215
-RUN --mount=type=cache,id=maven-${STORAGE_CONNECTOR},target=/root/.m2/repository <<EOF
-cd trino-storage-${STORAGE_CONNECTOR}-src
-./patches/apply_patches.sh ${STORAGE_CONNECTOR}
-
-# Upstream builds are marked as -SNAPSHOT, even for release builds
-mvn versions:set -DnewVersion=${STORAGE_CONNECTOR}
-
-# 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
-EOF
+FROM stackable/image/trino-storage-connector AS trino-storage-connector-image
 
 FROM stackable/image/java-devel AS trino-builder
 
 ARG PRODUCT
-ARG STORAGE_CONNECTOR
 ARG STACKABLE_USER_UID
 
 RUN <<EOF
@@ -94,8 +60,7 @@ chown --recursive ${STACKABLE_USER_UID}:0 /stackable/trino-server-${PRODUCT}
 rm -r /stackable/trino-server-${PRODUCT}-src
 EOF
 
-COPY --from=storage-connector-builder /stackable/trino-storage-${STORAGE_CONNECTOR}-src/target/trino-storage-${STORAGE_CONNECTOR} /stackable/trino-server-${PRODUCT}/plugin/trino-storage-${STORAGE_CONNECTOR}
-
+COPY --from=trino-storage-connector-image /stackable/trino-storage-${PRODUCT}-src/target/trino-storage-${PRODUCT} /stackable/trino-server-${PRODUCT}/plugin/trino-storage-${PRODUCT}
 # For earlier versions this script removes the .class file that contains the
 # vulnerable code.
 # TODO: This can be restricted to target only versions which do not honor the environment
diff --git a/trino/versions.py b/trino/versions.py
index 0ed0bd281..1aa1ec4bc 100644
--- a/trino/versions.py
+++ b/trino/versions.py
@@ -4,20 +4,20 @@
         "java-base": "22",
         "java-devel": "22",
         "jmx_exporter": "1.1.0",
-        "storage_connector": "451",
+        "trino-storage-connector": "451",
     },
     {
         "product": "455",
         "java-base": "22",
         "java-devel": "22",
         "jmx_exporter": "1.1.0",
-        "storage_connector": "455",
+        "trino-storage-connector": "455",
     },
     {
         "product": "469",
         "java-base": "23",
         "java-devel": "23",
         "jmx_exporter": "1.1.0",
-        "storage_connector": "469",
+        "trino-storage-connector": "469",
     },
 ]

From c140cfb1b130cca08fd58eea64dc41a3c4f76412 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Fri, 7 Feb 2025 12:34:35 +0100
Subject: [PATCH 3/5] chore(trino-storage-connector): Patch 469

---
 .../469/0001-Add-cyclonedx-plugin.patch       | 42 +++++++++++++++++++
 .../stackable/patches/469/patchable.toml      |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 trino-storage-connector/stackable/patches/469/0001-Add-cyclonedx-plugin.patch
 create mode 100644 trino-storage-connector/stackable/patches/469/patchable.toml

diff --git a/trino-storage-connector/stackable/patches/469/0001-Add-cyclonedx-plugin.patch b/trino-storage-connector/stackable/patches/469/0001-Add-cyclonedx-plugin.patch
new file mode 100644
index 000000000..1d3f74215
--- /dev/null
+++ b/trino-storage-connector/stackable/patches/469/0001-Add-cyclonedx-plugin.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nick Larsen <nick.larsen@stackable.tech>
+Date: Fri, 7 Feb 2025 12:32:20 +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
+--- 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>
+
+base-commit: e2612ce1e2801211dc090bab32f28107b563a2ae
+-- 
+2.40.1
+
diff --git a/trino-storage-connector/stackable/patches/469/patchable.toml b/trino-storage-connector/stackable/patches/469/patchable.toml
new file mode 100644
index 000000000..674e38e6d
--- /dev/null
+++ b/trino-storage-connector/stackable/patches/469/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/snowlift/trino-storage"
+base = "e2612ce1e2801211dc090bab32f28107b563a2ae"

From 35a751bbd096160b03afa7b495a64d929ead3932 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Fri, 7 Feb 2025 12:40:41 +0100
Subject: [PATCH 4/5] chore: Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a26f533db..51350bcf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,11 +21,13 @@ All notable changes to this project will be documented in this file.
 - java: Add JDK/JRE 23 ([#992]).
 - trino: Add 469 ([#993]).
 - trino-cli: Add version 469 ([#993]).
+- trino-storage-connector: Add version 469 ([#996]).
 
 ### Changed
 
 - kafka: Bump 3.8.0 to 3.8.1 ([#995]).
 - Update registry references to oci ([#989]).
+- trino-storage-connector: Move the build out of trino/ for easier patching ([#996]).
 
 ### Removed
 
@@ -56,6 +58,7 @@ All notable changes to this project will be documented in this file.
 [#992]: https://github.com/stackabletech/docker-images/pull/992
 [#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
 
 ## [24.11.1] - 2025-01-14
 

From f1c56f21380fc36ed6abf91c48f840635210f083 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Mon, 10 Feb 2025 11:45:03 +0100
Subject: [PATCH 5/5] chore(trino-storage-connector): Rename upload script

---
 ...e_version.sh => upload_new_trino_storage_connector_version.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename trino-storage-connector/{upload_new_trino_storage_version.sh => upload_new_trino_storage_connector_version.sh} (100%)

diff --git a/trino-storage-connector/upload_new_trino_storage_version.sh b/trino-storage-connector/upload_new_trino_storage_connector_version.sh
similarity index 100%
rename from trino-storage-connector/upload_new_trino_storage_version.sh
rename to trino-storage-connector/upload_new_trino_storage_connector_version.sh