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 e7ba2c9aada57e8c2e9ac1cd5e69ad8d31c905ce Merge: 641424faeb 3f64c58dfd Author: Michael Blow <[email protected]> AuthorDate: Mon Dec 9 13:10:39 2024 -0500 Merge branch 'gerrit/trinity' into 'gerrit/goldfish' Ext-ref: MB-64482 Change-Id: I8f33eb81468d6fc578ac49101a44f73e5c597511 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(-) diff --cc asterixdb/asterix-app/pom.xml index 950ff4ec49,d9f235f76d..1b6ec5e9c8 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@@ -531,14 -408,8 +531,14 @@@ -Dfile.encoding=UTF-8 -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} - -Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log" -XX:+PrintGC -XX:+PrintGCDateStamps -XX:GCLogFileSize=10M - -Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log" -XX:+PrintGC - --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED ++ -Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log" -XX:+PrintGC -XX:GCLogFileSize=10M + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED + --add-opens=java.management/sun.management=ALL-UNNAMED + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED + --add-opens=java.base/sun.nio.ch=ALL-UNNAMED </argLine> </configuration> <goals> diff --cc asterixdb/asterix-server/pom.xml index 09ba045ed0,48a2db45bf..83ee04df93 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -561,45 -540,6 +561,49 @@@ <gav>com.google.api:gax-grpc:2.7.1</gav> <url>https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE</url> </override> + <override> + <gavs> + <gav>org.jetbrains:annotations:17.0.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/JetBrains/java-annotations/master/LICENSE.txt</url> + </override> + <override> + <gavs> + <gav>org.roaringbitmap:RoaringBitmap:0.9.22</gav> + <gav>org.roaringbitmap:shims:0.9.22</gav> + </gavs> + <url>https://raw.githubusercontent.com/RoaringBitmap/RoaringBitmap/0.9.39/LICENSE</url> + </override> + <override> + <gavs> + <gav>io.airlift:aircompressor:0.21</gav> + </gavs> + <url>https://raw.githubusercontent.com/airlift/aircompressor/0.21/license.txt</url> + <noticeUrl>https://raw.githubusercontent.com/airlift/aircompressor/0.21/notice.md</noticeUrl> + </override> + <override> + <gavs> + <gav>org.apache.orc:orc-core:1.8.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/apache/orc/v1.8.0/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/apache/orc/v1.8.0/NOTICE</noticeUrl> + </override> + <override> + <gavs> + <gav>tech.allegro.schema.json2avro:converter:0.2.15</gav> + </gavs> + <url>https://raw.githubusercontent.com/allegro/json-avro-converter/json-avro-converter-0.2.15/LICENSE.md</url> + </override> + <override> + <gavs> + <gav>com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1</gav> + </gavs> + <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> + </override> ++ <override> ++ <gav>org.bouncycastle:bcprov-jdk18on:1.78.1</gav> ++ <url>https://raw.githubusercontent.com/bcgit/bc-java/refs/tags/r1rv78v1/LICENSE.html</url> ++ </override> </overrides> <licenses> <license> diff --cc asterixdb/pom.xml index 3620f8e6ba,03770129ec..c0f97927fe --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -81,31 -81,24 +81,32 @@@ <shim.stage>none</shim.stage> <pytestlib.stage>none</pytestlib.stage> <skip-npm-touch.stage>none</skip-npm-touch.stage> + <azurite.npm.install.stage>none</azurite.npm.install.stage> + <azurite.install.stage>none</azurite.install.stage> + <azurite.stage>none</azurite.stage> + <gcs.download.stage>none</gcs.download.stage> + <gcs.install.stage>none</gcs.install.stage> + <gcs.stage>none</gcs.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.10-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.10-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.22.1</log4j.version> - <awsjavasdk.version>2.24.9</awsjavasdk.version> + <awsjavasdk.version>2.29.27</awsjavasdk.version> - <parquet.version>1.12.3</parquet.version> + <awsjavasdk.crt.version>0.29.10</awsjavasdk.crt.version> + <parquet.version>1.14.1</parquet.version> - <hadoop-awsjavasdk.version>1.12.637</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> <azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version> - <gcsjavasdk.version>2.40.1</gcsjavasdk.version> + <gcsjavasdk.version>2.45.0</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> - <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version> + <hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version> + <io.opencensus.version>0.31.1</io.opencensus.version> + <protobuf-java.version>3.23.2</protobuf-java.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@@ -2058,72 -1990,53 +2074,117 @@@ <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-census</artifactId> - <version>1.56.1</version> + <version>1.68.1</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-http-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-api</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-impl</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-impl-core</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-exporter-stats-stackdriver</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-exemplar-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-resource-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-exporter-metrics-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-grpc-metrics</artifactId> + <version>${io.opencensus.version}</version> </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>1.12.0</version> + </dependency> + <dependency> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-core</artifactId> + <version>1.5.2</version> + </dependency> + <dependency> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-data</artifactId> + <version>1.5.2</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.iceberg</groupId> + <artifactId>iceberg-parquet</artifactId> + <version>1.5.2</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-avro</artifactId> + <version>${parquet.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-jackson</artifactId> + <version>${parquet.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf-java.version}</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java-util</artifactId> + <version>${protobuf-java.version}</version> + </dependency> </dependencies> </dependencyManagement> diff --cc asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt index b8f46c5713,0000000000..24506f04cc mode 100644,000000..100644 --- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_bcgit_bc-java_refs_tags_r1rv78v1_LICENSE.html.txt @@@ -1,17 -1,0 +1,17 @@@ - Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) ++Copyright (c) 2000-2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software +and associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --cc hyracks-fullstack/pom.xml index 84d1416c38,66b4ebb947..ec78f7bd00 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -75,8 -75,7 +75,8 @@@ <snappy.version>1.1.10.5</snappy.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> + <asm.version>9.3</asm.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url>
