diff --git a/.github/ISSUE_TEMPLATE/update-base-vector.md b/.github/ISSUE_TEMPLATE/update-base-vector.md index a003b9926..0a994c976 100644 --- a/.github/ISSUE_TEMPLATE/update-base-vector.md +++ b/.github/ISSUE_TEMPLATE/update-base-vector.md @@ -38,16 +38,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Upload new version (see `vector/upload_new_vector_version.sh`). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: inotify_tools, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-airflow.md b/.github/ISSUE_TEMPLATE/update-product-airflow.md index 7e492a590..0351f3339 100644 --- a/.github/ISSUE_TEMPLATE/update-product-airflow.md +++ b/.github/ISSUE_TEMPLATE/update-product-airflow.md @@ -30,7 +30,7 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Update `versions.py` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions). - [ ] Download new constraints file (see `airflow/download_constraints.sh`). - [ ] Update other dependencies if applicable (eg: python, statsd_exporter, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` @@ -39,7 +39,7 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] _Link to the docker-images PR (product update)_ - [ ] _Link to operator PR (getting_started / kuttl)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-druid.md b/.github/ISSUE_TEMPLATE/update-product-druid.md index 69af3ea1e..4db8638cd 100644 --- a/.github/ISSUE_TEMPLATE/update-product-druid.md +++ b/.github/ISSUE_TEMPLATE/update-product-druid.md @@ -33,16 +33,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Delete old patch directories. - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions. -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) PR_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md b/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md index d7d9dd994..205a5afa4 100644 --- a/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md +++ b/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md @@ -31,7 +31,7 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Upload new versions (see the `hbase/*.sh` scripts). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: phoenix, opa_authorizer, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR to the list below. ``` ```[tasklist] @@ -47,7 +47,7 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] _Link to the docker-images PR (product update)_ - [ ] _Link to operator PR (getting_started / kuttl)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-hdfs.md b/.github/ISSUE_TEMPLATE/update-product-hdfs.md index 257081b91..7481f5656 100644 --- a/.github/ISSUE_TEMPLATE/update-product-hdfs.md +++ b/.github/ISSUE_TEMPLATE/update-product-hdfs.md @@ -31,7 +31,7 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Upload new version (see `hadoop/upload_new_hadoop_version.sh`). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: hdfs_utils, jmx_exporter, protobuf, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` @@ -39,9 +39,9 @@ Add/Change/Remove anything that isn't applicable anymore ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ - [ ] _Link to [hdfs-utils](https://github.com/stackabletech/hdfs-utils/) PR (if applicable)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-hive.md b/.github/ISSUE_TEMPLATE/update-product-hive.md index 4ad7c12dd..fb90030b3 100644 --- a/.github/ISSUE_TEMPLATE/update-product-hive.md +++ b/.github/ISSUE_TEMPLATE/update-product-hive.md @@ -31,16 +31,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Upload new version (see `hive/upload_new_hive_version.sh`). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: jmx_exporter, aws_java_sdk_bundle, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-kafka.md b/.github/ISSUE_TEMPLATE/update-product-kafka.md index 909aa3a33..c526e30b0 100644 --- a/.github/ISSUE_TEMPLATE/update-product-kafka.md +++ b/.github/ISSUE_TEMPLATE/update-product-kafka.md @@ -31,7 +31,7 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Upload new version (see `kafka/upload_new_kafka_version.sh`). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: jmx_exporter, kcat, scala, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` @@ -42,16 +42,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Update `kafka-testing-tools/versions.py`. - [ ] Upload new version (see `.scripts/upload_new_kcat_version.sh`). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-nifi.md b/.github/ISSUE_TEMPLATE/update-product-nifi.md index 887c2a67f..aa90495dc 100644 --- a/.github/ISSUE_TEMPLATE/update-product-nifi.md +++ b/.github/ISSUE_TEMPLATE/update-product-nifi.md @@ -31,16 +31,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Upload new version (see `nifi/upload_new_nifi_version.sh`). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: jmx_exporter, kcat, scala, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-opa.md b/.github/ISSUE_TEMPLATE/update-product-opa.md index e5893f6d0..b0a48a473 100644 --- a/.github/ISSUE_TEMPLATE/update-product-opa.md +++ b/.github/ISSUE_TEMPLATE/update-product-opa.md @@ -30,16 +30,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Update `versions.py` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions). - [ ] Upload new version (see `opa/upload_new_opa_version.sh`). - [ ] Update other dependencies if applicable (eg: opa_bundle_builder, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-spark.md b/.github/ISSUE_TEMPLATE/update-product-spark.md index 2e580204d..02dcd3022 100644 --- a/.github/ISSUE_TEMPLATE/update-product-spark.md +++ b/.github/ISSUE_TEMPLATE/update-product-spark.md @@ -32,16 +32,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Ensure that the transitive dependencies in `versions.py` are compatible with the Spark version(s). - [ ] Update other dependencies if applicable (eg: python, jmx_exporter, aws_java_sdk_bundle, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-superset.md b/.github/ISSUE_TEMPLATE/update-product-superset.md index f0ca1bb65..e56bb273f 100644 --- a/.github/ISSUE_TEMPLATE/update-product-superset.md +++ b/.github/ISSUE_TEMPLATE/update-product-superset.md @@ -32,16 +32,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Create a file: `superset/stackable/patches/x.y.z/.gitkeep`, add patches if applicable. - [ ] Delete old constraint files and patch directories. - [ ] Update other dependencies if applicable (eg: python, auth_lib, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-trino.md b/.github/ISSUE_TEMPLATE/update-product-trino.md index a2445cd27..7f328f218 100644 --- a/.github/ISSUE_TEMPLATE/update-product-trino.md +++ b/.github/ISSUE_TEMPLATE/update-product-trino.md @@ -31,7 +31,7 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] 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) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` @@ -40,16 +40,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Update `trino-cli/versions.py` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions). - [ ] Upload new version (see `trino-cli/upload_new_trino_version.sh` scripts). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md index 38cc39ba7..3bc459017 100644 --- a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md +++ b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md @@ -31,16 +31,16 @@ Add/Change/Remove anything that isn't applicable anymore - [ ] Upload new version (see `zookeeper/upload_new_zookeeper_version.sh`). - [ ] Update `versions.py` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: jmx_exporter, etc). -- [ ] Check other operators (getting_started / kuttl) for usage of the versions. Add the PR(s) to the list below. +- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. ``` ```[tasklist] ### Related Pull Requests - [ ] _Link to the docker-images PR (product update)_ -- [ ] _Link to the operator PR (getting_started / kuttl)_ +- [ ] _Link to the operator PR (getting_started / kuttl / supported-versions)_ - [ ] _Link to any other operator PRs (getting_started / kuttl)_ -- [ ] _Link to demo PR (raise against the `next` branch)_ +- [ ] _Link to demo PR (raise against the `main` branch)_ - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_ ``` diff --git a/CHANGELOG.md b/CHANGELOG.md index a5aef1ec0..753850ce8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ All notable changes to this project will be documented in this file. - statsd-exporter: Bump version to 0.28.0 ([#982]). - git-sync: Bump version to 4.4.0 ([#990]). - kafka: Add versions 3.7.2 and 3.9.0 ([#988]). +- java: Add JDK/JRE 23 ([#992]). +- trino: Add 469 ([#993]). +- trino-cli: Add version 469 ([#993]). ### Changed @@ -48,6 +51,8 @@ All notable changes to this project will be documented in this file. [#989]: https://github.com/stackabletech/docker-images/pull/989 [#990]: https://github.com/stackabletech/docker-images/pull/990 [#988]: https://github.com/stackabletech/docker-images/pull/988 +[#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 ## [24.11.1] - 2025-01-14 diff --git a/trino-cli/versions.py b/trino-cli/versions.py index b6d60aa4a..57f242ea5 100644 --- a/trino-cli/versions.py +++ b/trino-cli/versions.py @@ -1,6 +1,8 @@ +# This image is only used in integration tests and demos. +# It's therefore ok if we only support a single version at a time. versions = [ { - "product": "455", - "java-base": "22", + "product": "469", + "java-base": "23", }, ] diff --git a/trino/stackable/patches/jmx-exporter/1.0.1/001-cyclonedx-plugin.patch b/trino/stackable/patches/469/0001-Add-cyclonedx-plugin.patch similarity index 53% rename from trino/stackable/patches/jmx-exporter/1.0.1/001-cyclonedx-plugin.patch rename to trino/stackable/patches/469/0001-Add-cyclonedx-plugin.patch index 2e675f22e..bbd6eabd5 100644 --- a/trino/stackable/patches/jmx-exporter/1.0.1/001-cyclonedx-plugin.patch +++ b/trino/stackable/patches/469/0001-Add-cyclonedx-plugin.patch @@ -1,28 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nick Larsen +Date: Tue, 4 Feb 2025 10:49:16 +0100 +Subject: Add cyclonedx plugin + +--- + pom.xml | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + diff --git a/pom.xml b/pom.xml -index 01b434c..35c3697 100644 +index 0d27151d77..b1682d7ab3 100644 --- a/pom.xml +++ b/pom.xml -@@ -278,6 +278,23 @@ - - +@@ -2850,6 +2850,24 @@ + + + + org.cyclonedx + cyclonedx-maven-plugin -+ 2.8.0 ++ 2.9.1 + + application -+ 1.5 ++ 1.6 ++ false + + + -+ package + + makeBom + ++ package + + + + +base-commit: 39ef08e249549a6616916539f4ad21032d084c7a +-- +2.40.1 + diff --git a/trino/stackable/patches/469/patchable.toml b/trino/stackable/patches/469/patchable.toml new file mode 100644 index 000000000..324f1b029 --- /dev/null +++ b/trino/stackable/patches/469/patchable.toml @@ -0,0 +1,2 @@ +upstream = "https://github.com/trinodb/trino" +base = "39ef08e249549a6616916539f4ad21032d084c7a" diff --git a/trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch b/trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch deleted file mode 100644 index 390ae15b1..000000000 --- a/trino/stackable/patches/trino-storage/451/001-cyclonedx-plugin.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 7304dac..5ba854d 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -544,6 +544,23 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - - diff --git a/trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch b/trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch deleted file mode 100644 index 387997d5d..000000000 --- a/trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/versions.py b/trino/versions.py index 96f771922..0ed0bd281 100644 --- a/trino/versions.py +++ b/trino/versions.py @@ -3,14 +3,21 @@ "product": "451", "java-base": "22", "java-devel": "22", - "jmx_exporter": "1.0.1-stackable", + "jmx_exporter": "1.1.0", "storage_connector": "451", }, { "product": "455", "java-base": "22", "java-devel": "22", - "jmx_exporter": "1.0.1-stackable", + "jmx_exporter": "1.1.0", "storage_connector": "455", }, + { + "product": "469", + "java-base": "23", + "java-devel": "23", + "jmx_exporter": "1.1.0", + "storage_connector": "469", + }, ]