You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2023/01/27 14:19:37 UTC
[asterixdb] 07/10: Merge branch 'gerrit/cheshire-cat'
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 8fbe5ddd49f7420aac67602a2eb89965e5b43015
Merge: 429cf26230 23fc48b4e2
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Jan 17 10:32:08 2023 -0500
Merge branch 'gerrit/cheshire-cat'
Change-Id: Ifb4a910590d27465951dd7e5fad11110a427fb47
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 88 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
.../hyracks/test/support/LicensingTestBase.java | 4 +-
hyracks-fullstack/pom.xml | 35 +++++----
10 files changed, 68 insertions(+), 68 deletions(-)
diff --cc asterixdb/pom.xml
index d48eb8a6a5,5d6a5fe962..1aff200bc8
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -82,18 -82,14 +82,18 @@@
<skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
- <hadoop.version>2.8.5</hadoop.version>
+ <algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
+ <hadoop.version>3.3.4</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
- <azurejavasdk.version>12.12.0</azurejavasdk.version>
- <parquet.version>1.8.2</parquet.version>
+ <parquet.version>1.12.3</parquet.version>
+ <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
+ <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
+ <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
+ <gcsjavasdk.version>2.9.0</gcsjavasdk.version>
+ <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --cc hyracks-fullstack/pom.xml
index 86e588df84,b91cbd1afb..69a82799b5
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -70,11 -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>2.8.5</hadoop.version>
+ <hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
- <jackson.version>2.13.4</jackson.version>
+ <jackson.version>2.14.1</jackson.version>
+ <jackson-databind.version>${jackson.version}</jackson-databind.version>
+ <netty.version>4.1.87.Final</netty.version>
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@@ -259,13 -215,13 +261,18 @@@
<groupId>log4j</groupId>
<artifactId>log4j</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>
+ <groupId>com.e-movimento.tinytools</groupId>
+ <artifactId>privilegedaccessor</artifactId>
+ <version>1.3</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>