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 9603080f7d018062539b5d0be6d98ac8331126f8 Merge: a604a56b67 29f3d06f13 Author: Michael Blow <[email protected]> AuthorDate: Sat Dec 7 11:33:16 2024 -0500 Merge branch 'gerrit/7.1.x' into 'gerrit/neo' Ext-ref: MB-64482 Change-Id: Id4a88a4302cefe4df693e7cce8f29995402d60f7 asterixdb/asterix-external-data/pom.xml | 4 + asterixdb/pom.xml | 57 +- .../appended-resources/supplemental-models.xml | 584 +++++++++++++++------ ...-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 - ...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 | 21 +- 26 files changed, 663 insertions(+), 467 deletions(-) diff --cc asterixdb/pom.xml index dd9c7d8d74,141ca6dfae..9d66b79a40 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -82,14 -82,14 +82,14 @@@ <skip-npm-touch.stage>none</skip-npm-touch.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.8-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.8-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version> - <hadoop.version>3.3.6</hadoop.version> + <hadoop.version>3.4.1</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> - <awsjavasdk.version>2.23.3</awsjavasdk.version> + <awsjavasdk.version>2.29.27</awsjavasdk.version> <parquet.version>1.12.3</parquet.version> - <hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.version> + <hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.25.1</azureblobjavasdk.version> <azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version> <azureidentity.version>1.13.3</azureidentity.version> @@@ -1075,6 -1077,6 +1072,10 @@@ <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> </exclusion> ++ <exclusion> ++ <groupId>org.apache.avro</groupId> ++ <artifactId>avro</artifactId> ++ </exclusion> </exclusions> </dependency> <dependency> @@@ -1118,6 -1128,6 +1119,10 @@@ <groupId>ch.qos.reload4j</groupId> <artifactId>reload4j</artifactId> </exclusion> ++ <exclusion> ++ <groupId>org.apache.avro</groupId> ++ <artifactId>avro</artifactId> ++ </exclusion> </exclusions> </dependency> <dependency> @@@ -1141,6 -1155,10 +1146,14 @@@ <groupId>org.jline</groupId> <artifactId>jline</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> ++ <exclusion> ++ <groupId>org.apache.avro</groupId> ++ <artifactId>avro</artifactId> ++ </exclusion> </exclusions> </dependency> <dependency> diff --cc asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.3_COPYING.txt index 1625c17936,1625c17936..0000000000 deleted file mode 100644,100644 --- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.3_COPYING.txt +++ /dev/null @@@ -1,121 -1,121 +1,0 @@@ --Creative Commons Legal Code -- --CC0 1.0 Universal -- -- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE -- LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN -- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS -- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES -- REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS -- PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM -- THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED -- HEREUNDER. -- --Statement of Purpose -- --The laws of most jurisdictions throughout the world automatically confer --exclusive Copyright and Related Rights (defined below) upon the creator --and subsequent owner(s) (each and all, an "owner") of an original work of --authorship and/or a database (each, a "Work"). -- --Certain owners wish to permanently relinquish those rights to a Work for --the purpose of contributing to a commons of creative, cultural and --scientific works ("Commons") that the public can reliably and without fear --of later claims of infringement build upon, modify, incorporate in other --works, reuse and redistribute as freely as possible in any form whatsoever --and for any purposes, including without limitation commercial purposes. --These owners may contribute to the Commons to promote the ideal of a free --culture and the further production of creative, cultural and scientific --works, or to gain reputation or greater distribution for their Work in --part through the use and efforts of others. -- --For these and/or other purposes and motivations, and without any --expectation of additional consideration or compensation, the person --associating CC0 with a Work (the "Affirmer"), to the extent that he or she --is an owner of Copyright and Related Rights in the Work, voluntarily --elects to apply CC0 to the Work and publicly distribute the Work under its --terms, with knowledge of his or her Copyright and Related Rights in the --Work and the meaning and intended legal effect of CC0 on those rights. -- --1. Copyright and Related Rights. A Work made available under CC0 may be --protected by copyright and related or neighboring rights ("Copyright and --Related Rights"). Copyright and Related Rights include, but are not --limited to, the following: -- -- i. the right to reproduce, adapt, distribute, perform, display, -- communicate, and translate a Work; -- ii. moral rights retained by the original author(s) and/or performer(s); --iii. publicity and privacy rights pertaining to a person's image or -- likeness depicted in a Work; -- iv. rights protecting against unfair competition in regards to a Work, -- subject to the limitations in paragraph 4(a), below; -- v. rights protecting the extraction, dissemination, use and reuse of data -- in a Work; -- vi. database rights (such as those arising under Directive 96/9/EC of the -- European Parliament and of the Council of 11 March 1996 on the legal -- protection of databases, and under any national implementation -- thereof, including any amended or successor version of such -- directive); and --vii. other similar, equivalent or corresponding rights throughout the -- world based on applicable law or treaty, and any national -- implementations thereof. -- --2. Waiver. To the greatest extent permitted by, but not in contravention --of, applicable law, Affirmer hereby overtly, fully, permanently, --irrevocably and unconditionally waives, abandons, and surrenders all of --Affirmer's Copyright and Related Rights and associated claims and causes --of action, whether now known or unknown (including existing as well as --future claims and causes of action), in the Work (i) in all territories --worldwide, (ii) for the maximum duration provided by applicable law or --treaty (including future time extensions), (iii) in any current or future --medium and for any number of copies, and (iv) for any purpose whatsoever, --including without limitation commercial, advertising or promotional --purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each --member of the public at large and to the detriment of Affirmer's heirs and --successors, fully intending that such Waiver shall not be subject to --revocation, rescission, cancellation, termination, or any other legal or --equitable action to disrupt the quiet enjoyment of the Work by the public --as contemplated by Affirmer's express Statement of Purpose. -- --3. Public License Fallback. Should any part of the Waiver for any reason --be judged legally invalid or ineffective under applicable law, then the --Waiver shall be preserved to the maximum extent permitted taking into --account Affirmer's express Statement of Purpose. In addition, to the --extent the Waiver is so judged Affirmer hereby grants to each affected --person a royalty-free, non transferable, non sublicensable, non exclusive, --irrevocable and unconditional license to exercise Affirmer's Copyright and --Related Rights in the Work (i) in all territories worldwide, (ii) for the --maximum duration provided by applicable law or treaty (including future --time extensions), (iii) in any current or future medium and for any number --of copies, and (iv) for any purpose whatsoever, including without --limitation commercial, advertising or promotional purposes (the --"License"). The License shall be deemed effective as of the date CC0 was --applied by Affirmer to the Work. Should any part of the License for any --reason be judged legally invalid or ineffective under applicable law, such --partial invalidity or ineffectiveness shall not invalidate the remainder --of the License, and in such case Affirmer hereby affirms that he or she --will not (i) exercise any of his or her remaining Copyright and Related --Rights in the Work or (ii) assert any associated claims and causes of --action with respect to the Work, in either case contrary to Affirmer's --express Statement of Purpose. -- --4. Limitations and Disclaimers. -- -- a. No trademark or patent rights held by Affirmer are waived, abandoned, -- surrendered, licensed or otherwise affected by this document. -- b. Affirmer offers the Work as-is and makes no representations or -- warranties of any kind concerning the Work, express, implied, -- statutory or otherwise, including without limitation warranties of -- title, merchantability, fitness for a particular purpose, non -- infringement, or the absence of latent or other defects, accuracy, or -- the present or absence of errors, whether or not discoverable, all to -- the greatest extent permissible under applicable law. -- c. Affirmer disclaims responsibility for clearing rights of other persons -- that may apply to the Work or any use thereof, including without -- limitation any person's Copyright and Related Rights in the Work. -- Further, Affirmer disclaims responsibility for obtaining any necessary -- consents, permissions or other rights required for any use of the -- Work. -- d. Affirmer understands and acknowledges that Creative Commons is not a -- party to this document and has no duty or obligation with respect to -- this CC0 or use of the Work. diff --cc asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.3_LICENSE.txt index eadae05fc8,eadae05fc8..0000000000 deleted file mode 100644,100644 --- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_reactive-streams_reactive-streams-jvm_v1.0.3_LICENSE.txt +++ /dev/null @@@ -1,8 -1,8 +1,0 @@@ --Licensed under Public Domain (CC0) -- --To the extent possible under law, the person who associated CC0 with --this code has waived all copyright and related or neighboring --rights to this code. -- --You should have received a copy of the CC0 legalcode along with this --work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. diff --cc hyracks-fullstack/pom.xml index 487cadddd9,e33184cba0..45e97c4090 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -74,9 -74,9 +74,9 @@@ <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> <snappy.version>1.1.10.5</snappy.version> - <jackson.version>2.14.1</jackson.version> + <jackson.version>2.14.3</jackson.version> <jackson-databind.version>${jackson.version}</jackson-databind.version> - <netty.version>4.1.101.Final</netty.version> + <netty.version>4.1.115.Final</netty.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@@ -135,11 -125,11 +135,16 @@@ <artifactId>netty-transport-classes-epoll</artifactId> <version>${netty.version}</version> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-resolver</artifactId> + <version>${netty.version}</version> + </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-resolver-dns</artifactId>
