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 5567be6377901b087974eeb4ed8070d3da8e850d Merge: 3227d347d1 6671523714 Author: Michael Blow <[email protected]> AuthorDate: Thu Oct 5 17:16:18 2023 -0400 Merge branch 'gerrit/7.1.x' into 'gerrit/neo' Change-Id: I63e00f78c78f7f5c15c0a8587c8f591035b4df82 asterixdb/asterix-external-data/pom.xml | 15 +- asterixdb/asterix-server/pom.xml | 9 + asterixdb/pom.xml | 101 ++------ .../appended-resources/supplemental-models.xml | 266 +++++++++++---------- ...oogleapis_api-common-java_blob_main_LICENSE.txt | 26 ++ ...com_googleapis_gax-java_blob_master_LICENSE.txt | 27 +++ .../opensource.org_licenses_BSD-3-Clause.txt | 11 + ...ercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt | 62 ----- ...rcontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} | 0 ...nt.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt} | 10 +- .../licenses/content/spdx.org_licenses_MIT.txt | 9 + hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 -- hyracks-fullstack/pom.xml | 61 +---- 13 files changed, 266 insertions(+), 345 deletions(-) diff --cc asterixdb/pom.xml index 9181f142d5,ca3314e683..6e68ab401c --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -82,9 -82,9 +82,9 @@@ <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.4</hadoop.version> + <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> <awsjavasdk.version>2.17.218</awsjavasdk.version> @@@ -989,22 -993,21 +989,17 @@@ <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@@ -1109,22 -1115,21 +1099,17 @@@ <groupId>com.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@@ -1176,22 -1184,21 +1156,17 @@@ <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@@ -1205,22 -1212,21 +1180,17 @@@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> diff --cc hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml index 33526f1d12,2010653560..237d799f58 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml @@@ -151,23 -151,18 +151,14 @@@ <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@@ -187,14 -182,13 +178,9 @@@ <artifactId>log4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --cc hyracks-fullstack/pom.xml index 7070ca605b,432947ebcb..0601b2f0e3 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -70,13 -70,13 +70,13 @@@ <test.includes>${global.test.includes}</test.includes> <test.excludes>${global.test.excludes}</test.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> - <hadoop.version>3.3.1</hadoop.version> + <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> - <snappy.version>1.1.10.1</snappy.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.87.Final</netty.version> + <netty.version>4.1.94.Final</netty.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@@ -195,22 -180,17 +195,13 @@@ <groupId>jdk.tools</groupId> <artifactId>jdk.tools</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> </exclusions> </dependency> @@@ -224,22 -204,9 +215,13 @@@ <artifactId>netty-all</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@@ -247,22 -214,9 +229,17 @@@ <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </exclusion> </exclusions> </dependency> @@@ -286,18 -233,9 +256,13 @@@ <scope>test</scope> <exclusions> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> </exclusions> </dependency> <dependency>
