You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2021/05/26 23:43:25 UTC
[asterixdb] 19/38: Merge branch 'gerrit/mad-hatter'
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 8c67f9cb4a380d23cdb3d3c04a85ff00e31b439d
Merge: 82f1931 6abbeea
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sun May 2 12:32:23 2021 -0400
Merge branch 'gerrit/mad-hatter'
Change-Id: I9fb18d2460cc83005380020c52a294c06c4b264c
asterixdb/asterix-server/pom.xml | 4 ++--
asterixdb/pom.xml | 4 ++--
.../main/appended-resources/supplemental-models.xml | 8 ++++----
...tent.com_netty_netty_netty-4.1.63.Final_NOTICE.txt} | 0
hyracks-fullstack/pom.xml | 18 +++++++++---------
5 files changed, 17 insertions(+), 17 deletions(-)
diff --cc asterixdb/pom.xml
index 6067ef9,43e0dfd..a930643
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -75,19 -75,14 +75,19 @@@
<itest.excludes>${global.itest.excludes}</itest.excludes>
<license.stage>compile</license.stage>
<resource.stage>process-classes</resource.stage>
+ <prepare-env.stage>none</prepare-env.stage>
+ <shim.stage>none</shim.stage>
+ <pytestlib.stage>none</pytestlib.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
+ <algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.13.3</log4j.version>
+ <log4j.version>2.14.1</log4j.version>
<awsjavasdk.version>2.10.83</awsjavasdk.version>
+ <azurejavasdk.version>12.6.0</azurejavasdk.version>
+ <parquet.version>1.8.2</parquet.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>