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:23 UTC
[asterixdb] 17/38: Merge tracking branch
'gerrit/stabilization-f69489'
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 2fe0e14266c32fbb2379b859acb08d095f109255
Merge: f9f467a 3856cb3
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat May 1 15:00:00 2021 -0400
Merge tracking branch 'gerrit/stabilization-f69489'
Change-Id: Ide3d9da3f2c2518afd0b488f6db5b2e3377ee8a7
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 f57d71e,ed486fd..36b4581
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -73,15 -71,13 +73,15 @@@
<global.itest.excludes/>
<itest.includes>${global.itest.includes}</itest.includes>
<itest.excludes>${global.itest.excludes}</itest.excludes>
+ <license.stage>compile</license.stage>
+ <resource.stage>process-classes</resource.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.4.2-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.4.2-SNAPSHOT</hyracks.version>
+ <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.5-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>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>