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 2022/01/25 03:40:54 UTC
[asterixdb] 02/13: Merge branch 'gerrit/stabilization-f69489'
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 725fcd2532071059841924c7fde0b1163dad6418
Merge: e8637d0 6411968
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Dec 10 09:22:38 2021 -0500
Merge branch 'gerrit/stabilization-f69489'
Change-Id: Ie67b5c38d267d3e8b01e4b0989f688d155311909
asterixdb/pom.xml | 2 +-
hyracks-fullstack/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --cc asterixdb/pom.xml
index 6952f0e,9ed9453..cd938dd
--- 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.14.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --cc hyracks-fullstack/pom.xml
index 9a2c886,3ad53f2..4193ca2
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -71,9 -69,7 +71,9 @@@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.14.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
+ <snappy.version>1.1.8.4</snappy.version>
+ <jackson.version>2.13.0</jackson.version>
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>