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 2021/02/03 16:39:48 UTC
[asterixdb] 05/14: Merge branch 'gerrit/mad-hatter'
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 3a86098c7bebdbf01811c046f67807320e5812ea
Merge: ef1479a 813a3b5
Author: Michael Blow <mb...@apache.org>
AuthorDate: Wed Jan 27 14:35:41 2021 -0500
Merge branch 'gerrit/mad-hatter'
Change-Id: Ie78ab114891214ce0c13481b51faa3a11c940a81
.../appended-resources/supplemental-models.xml | 6 ++--
hyracks-fullstack/pom.xml | 35 ++++++++++++++++++----
2 files changed, 33 insertions(+), 8 deletions(-)
diff --cc hyracks-fullstack/pom.xml
index bb20422,fa94aaa..219d5bd
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -306,15 -284,30 +306,40 @@@
<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>
++ <dependency>
+ <groupId>it.unimi.dsi</groupId>
+ <artifactId>fastutil</artifactId>
+ <version>8.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>2.13.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>