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 2020/05/14 00:06:14 UTC
[asterixdb] 06/20: 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 ad092f59a417d21c49e34d83bf872ae6f892e5f2
Merge: 1a01b52 4bf7048
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Apr 10 15:16:13 2020 -0400
Merge branch 'gerrit/stabilization-f69489'
Change-Id: I339550ff6766b3e841679d4467ee9ca2251db7f2
asterixdb/asterix-server/pom.xml | 4 ++--
.../appended-resources/supplemental-models.xml | 6 ++---
....com_netty_netty_netty-4.1.48.Final_NOTICE.txt} | 0
hyracks-fullstack/pom.xml | 27 +++++++++++++++++++++-
4 files changed, 31 insertions(+), 6 deletions(-)
diff --cc hyracks-fullstack/pom.xml
index bb57cd7,aa989be..f10f2fa
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -272,11 -270,11 +272,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>