This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit f9bb94e4b2492032131ed27a644a925d1fb0658b Merge: 1cffa2bc98 e7ba2c9aad Author: Apache AsterixDB Gerrit <[email protected]> AuthorDate: Sun Dec 15 19:13:42 2024 +0000 Merge "Merge branch 'gerrit/trinity' into 'gerrit/goldfish'" into goldfish asterixdb/asterix-app/pom.xml | 2 +- .../app/resource/PlanStagesGeneratorTest.java | 10 +- asterixdb/asterix-external-data/pom.xml | 12 +- asterixdb/asterix-server/pom.xml | 4 + asterixdb/pom.xml | 109 +++- .../appended-resources/supplemental-models.xml | 714 ++++++++++++++------- ...-library-for-java_refs_tags_v1.17.1_LICENSE.txt | 34 +- ..._tags_azure-core-http-netty_1.13.11_LICENSE.txt | 21 + ..._tags_azure-core-http-netty_1.13.11_NOTICE.txt} | 22 +- ...or-java_refs_tags_azure-core_1.45.1_LICENSE.txt | 21 + ...or-java_refs_tags_azure-core_1.45.1_NOTICE.txt} | 22 +- ...ava_refs_tags_azure-identity_1.13.3_LICENSE.txt | 21 + ...java_refs_tags_azure-identity_1.13.3_NOTICE.txt | 2 +- ...for-java_refs_tags_azure-json_1.3.0_LICENSE.txt | 21 + ...for-java_refs_tags_azure-json_1.3.0_NOTICE.txt} | 2 +- ...efs_tags_azure-storage-blob_12.25.1_LICENSE.txt | 21 + ...efs_tags_azure-storage-blob_12.25.1_NOTICE.txt} | 22 +- ...s_tags_azure-storage-common_12.24.1_LICENSE.txt | 21 + ...s_tags_azure-storage-common_12.24.1_NOTICE.txt} | 20 - ...azure-storage-file-datalake_12.18.1_LICENSE.txt | 21 + ...azure-storage-file-datalake_12.18.1_NOTICE.txt} | 20 - ...azure-storage-internal-avro_12.10.1_LICENSE.txt | 21 + ...azure-storage-internal-avro_12.10.1_NOTICE.txt} | 20 - ...it_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt} | 2 +- ...rcontent.com_grpc_grpc-java_v1.68.1_NOTICE.txt} | 0 ...com_netty_netty_netty-4.1.115.Final_NOTICE.txt} | 2 +- ...ntent.com_perfmark_perfmark_v0.27.0_NOTICE.txt} | 1 + ...streams_reactive-streams-jvm_v1.0.3_COPYING.txt | 121 ---- ...streams_reactive-streams-jvm_v1.0.3_LICENSE.txt | 8 - hyracks-fullstack/pom.xml | 17 +- 30 files changed, 777 insertions(+), 557 deletions(-)
