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 2c076aa73f4ae4179b9afeec3b8aab75d5b4dac7 Merge: a0ae04de29 91a7e800cf Author: Michael Blow <[email protected]> AuthorDate: Thu Jan 12 22:08:05 2023 -0500 Merge branch 'gerrit/stabilization-f69489' Change-Id: I70d92fe4aca5d667d0c77ea602949c961830b2bd asterixdb/asterix-app/pom.xml | 1 - asterixdb/asterix-external-data/pom.xml | 1 - asterixdb/pom.xml | 4 +- .../appended-resources/supplemental-models.xml | 58 +++++++++++----------- ....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-fullstack/pom.xml | 26 ++++++---- 9 files changed, 47 insertions(+), 46 deletions(-) diff --cc asterixdb/pom.xml index 8a945928f2,127d77c748..15dc445c92 --- 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.17.1</log4j.version> + <log4j.version>2.19.0</log4j.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url>
