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/06/14 01:18:43 UTC
[asterixdb] 06/14: Merge branch gerrit/stabilization-667a908755 into neo
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 1951421ebaf8e92d9cc2424fa7410d07d8c067d3
Merge: 47aa7a5cc3 46ca03f935
Author: Hussain Towaileb <Hu...@couchbase.com>
AuthorDate: Sat May 27 20:43:59 2023 +0300
Merge branch gerrit/stabilization-667a908755 into neo
Change-Id: I30741e372bd765908b6ba9e976651c7113242f5c
asterixdb/asterix-external-data/pom.xml | 10 ++
asterixdb/asterix-server/pom.xml | 87 ++++------
asterixdb/pom.xml | 22 ++-
.../appended-resources/supplemental-models.xml | 180 ++++++++++++---------
...bc8e88873f0c1e42723640536866d3df_COPYRIGHT.txt} | 0
...bc7348d6be23d2a9daaacd6b8424b8c1_COPYRIGHT.txt} | 4 +-
...7db1c3a9d42f1ae39fb35cfbb54a8742_COPYRIGHT.txt} | 4 +-
...5b7e93858a39ad4a46ba4d0e17a0aefe_COPYRIGHT.txt} | 4 +-
...-sdk-for-java_azure-identity_1.9.0_LICENSE.txt} | 0
...e-sdk-for-java_azure-identity_1.9.0_NOTICE.txt} | 141 +++++++++++++---
...or-java_azure-storage-blob_12.22.0_LICENSE.txt} | 0
...for-java_azure-storage-blob_12.22.0_NOTICE.txt} | 45 ++++--
hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 8 +-
hyracks-fullstack/pom.xml | 15 ++
14 files changed, 348 insertions(+), 172 deletions(-)
diff --cc hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index 106bb08618,816746cfca..33526f1d12
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@@ -179,12 -183,20 +179,16 @@@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <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>