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 c100a0f302a97055a2104d5e06cf2ee8fddae94a Merge: 5949a1c 2d5bd95 Author: Michael Blow <[email protected]> AuthorDate: Tue Jun 16 20:38:16 2020 -0400 Merge branch 'gerrit/stabilization-f69489' updates the following dependencies: - netty -> 4.1.48.Final - commons-compress -> 1.20 - log4j -> 2.13.3 Change-Id: I5349c91fd70568ec8213e75389ef56b8b71bd9d9 asterixdb/asterix-app/pom.xml | 1 - asterixdb/asterix-server/pom.xml | 4 +- asterixdb/pom.xml | 1 + .../appended-resources/supplemental-models.xml | 6 +- ...t.com_netty_netty_netty-4.1.48.Final_NOTICE.txt | 248 +++++++++++++++++++++ hyracks-fullstack/pom.xml | 37 ++- 6 files changed, 288 insertions(+), 9 deletions(-) diff --cc asterixdb/pom.xml index 25550bf,81e53c5..f57d71e --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -73,14 -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> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> diff --cc hyracks-fullstack/pom.xml index bb57cd7,d8168ef..a224c50 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -272,11 -276,11 +278,36 @@@ <artifactId>maven-core</artifactId> <version>3.6.3</version> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.6.3</version> + </dependency> ++ <dependency> ++ <groupId>org.apache.maven</groupId> ++ <artifactId>maven-model</artifactId> ++ <version>3.6.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.maven</groupId> ++ <artifactId>maven-artifact</artifactId> ++ <version>3.6.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.maven</groupId> ++ <artifactId>maven-compat</artifactId> ++ <version>3.6.3</version> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.maven</groupId> ++ <artifactId>maven-core</artifactId> ++ <version>3.6.3</version> ++ </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.6.3</version> + </dependency> </dependencies> </dependencyManagement> <build>
