You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2020/10/02 04:13:32 UTC
[asterixdb] 01/02: Merge 0.9.5/0.3.5 release branch
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 44b4dd8eb1101b90957e8f2d16c823a63077d160
Merge: 731fa70 c95de7a
Author: Ian Maxon <ia...@maxons.email>
AuthorDate: Thu Oct 1 12:58:06 2020 -0700
Merge 0.9.5/0.3.5 release branch
Change-Id: I32cf2146a35e461d522c87f67e4d8304f6f9ab11
asterixdb/asterix-active/pom.xml | 4 +-
asterixdb/asterix-algebra/pom.xml | 2 +-
asterixdb/asterix-app/pom.xml | 6 +-
asterixdb/asterix-benchmark/pom.xml | 2 +-
asterixdb/asterix-client-helper/pom.xml | 2 +-
asterixdb/asterix-common/pom.xml | 2 +-
asterixdb/asterix-coverage/pom.xml | 2 +-
asterixdb/asterix-dashboard/pom.xml | 2 +-
asterixdb/asterix-doc/pom.xml | 2 +-
asterixdb/asterix-docker/pom.xml | 2 +-
asterixdb/asterix-examples/pom.xml | 2 +-
asterixdb/asterix-external-data/pom.xml | 10 +-
asterixdb/asterix-fuzzyjoin/pom.xml | 2 +-
asterixdb/asterix-geo/pom.xml | 2 +-
asterixdb/asterix-hivecompat/pom.xml | 6 +-
asterixdb/asterix-lang-aql/pom.xml | 2 +-
asterixdb/asterix-lang-common/pom.xml | 2 +-
asterixdb/asterix-lang-sqlpp/pom.xml | 2 +-
asterixdb/asterix-license/pom.xml | 2 +-
.../asterix-grammar-extension-maven-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
.../lexer-generator-maven-plugin/pom.xml | 2 +-
asterixdb/asterix-maven-plugins/pom.xml | 2 +-
.../record-manager-generator-maven-plugin/pom.xml | 2 +-
asterixdb/asterix-metadata/pom.xml | 2 +-
asterixdb/asterix-om/pom.xml | 2 +-
asterixdb/asterix-replication/pom.xml | 2 +-
asterixdb/asterix-runtime/pom.xml | 2 +-
asterixdb/asterix-server/pom.xml | 10 +-
.../src/main/opt/local/bin/start-sample-cluster.sh | 5 +-
.../src/main/opt/local/bin/stop-sample-cluster.sh | 7 +-
asterixdb/asterix-spidersilk/pom.xml | 2 +-
asterixdb/asterix-test-framework/pom.xml | 2 +-
asterixdb/asterix-tools/pom.xml | 2 +-
asterixdb/asterix-transactions/pom.xml | 2 +-
asterixdb/pom.xml | 95 ++++++---
.../algebricks/algebricks-common/pom.xml | 2 +-
.../algebricks/algebricks-compiler/pom.xml | 2 +-
.../algebricks/algebricks-core/pom.xml | 2 +-
.../algebricks/algebricks-data/pom.xml | 2 +-
.../algebricks/algebricks-rewriter/pom.xml | 2 +-
.../algebricks/algebricks-runtime/pom.xml | 2 +-
.../algebricks/algebricks-tests/pom.xml | 2 +-
hyracks-fullstack/algebricks/pom.xml | 2 +-
.../hyracks-fullstack-license/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-api/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-client/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-comm/pom.xml | 2 +-
.../hyracks-control/hyracks-control-cc/pom.xml | 2 +-
.../hyracks-control/hyracks-control-common/pom.xml | 2 +-
.../hyracks-control/hyracks-control-nc/pom.xml | 2 +-
.../hyracks-control/hyracks-nc-service/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-control/pom.xml | 2 +-
.../hyracks/hyracks-data/hyracks-data-std/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-data/pom.xml | 2 +-
.../hyracks/hyracks-dataflow-common/pom.xml | 2 +-
.../hyracks/hyracks-dataflow-std/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-dist/pom.xml | 2 +-
.../hyracks/hyracks-documentation/pom.xml | 2 +-
.../btree-example/btreeclient/pom.xml | 2 +-
.../btree-example/btreehelper/pom.xml | 2 +-
.../btree-example/btreeserver/pom.xml | 2 +-
.../hyracks/hyracks-examples/btree-example/pom.xml | 2 +-
.../hyracks-integration-tests/pom.xml | 2 +-
.../hyracks-examples/hyracks-shutdown-test/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-examples/pom.xml | 2 +-
.../hyracks/hyracks-examples/text-example/pom.xml | 2 +-
.../text-example/textclient/pom.xml | 2 +-
.../text-example/texthelper/pom.xml | 2 +-
.../text-example/textserver/pom.xml | 2 +-
.../hyracks/hyracks-examples/tpch-example/pom.xml | 2 +-
.../tpch-example/tpchclient/pom.xml | 2 +-
.../tpch-example/tpchserver/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 52 ++---
.../apache/hyracks/hdfs/dataflow/DataflowTest.java | 217 ---------------------
.../hyracks/hdfs2/dataflow/DataflowTest.java | 134 -------------
hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-ipc/pom.xml | 2 +-
.../hyracks-virtualcluster-maven-plugin/pom.xml | 2 +-
.../license-automation-plugin/pom.xml | 2 +-
.../hyracks/hyracks-maven-plugins/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-net/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-server/pom.xml | 2 +-
.../hyracks/hyracks-storage-am-bloomfilter/pom.xml | 2 +-
.../hyracks/hyracks-storage-am-btree/pom.xml | 2 +-
.../hyracks/hyracks-storage-am-common/pom.xml | 2 +-
.../hyracks/hyracks-storage-am-lsm-btree/pom.xml | 2 +-
.../hyracks/hyracks-storage-am-lsm-common/pom.xml | 2 +-
.../hyracks-storage-am-lsm-invertedindex/pom.xml | 2 +-
.../hyracks/hyracks-storage-am-lsm-rtree/pom.xml | 2 +-
.../hyracks/hyracks-storage-am-rtree/pom.xml | 2 +-
.../hyracks/hyracks-storage-common/pom.xml | 2 +-
.../hyracks/hyracks-test-support/pom.xml | 2 +-
.../hyracks-dataflow-common-test/pom.xml | 2 +-
.../hyracks-storage-am-bloomfilter-test/pom.xml | 2 +-
.../hyracks-storage-am-btree-test/pom.xml | 2 +-
.../hyracks-storage-am-lsm-btree-test/pom.xml | 2 +-
.../hyracks-storage-am-lsm-common-test/pom.xml | 2 +-
.../pom.xml | 2 +-
.../hyracks-storage-am-lsm-rtree-test/pom.xml | 2 +-
.../hyracks-storage-am-rtree-test/pom.xml | 2 +-
.../hyracks-storage-common-test/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-tests/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-util/pom.xml | 2 +-
hyracks-fullstack/hyracks/pom.xml | 2 +-
hyracks-fullstack/pom.xml | 29 ++-
pom.xml | 2 +-
107 files changed, 243 insertions(+), 522 deletions(-)
diff --cc asterixdb/asterix-external-data/pom.xml
index 3847576,5385438..4fed101
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@@ -465,8 -469,8 +461,12 @@@
<artifactId>auth</artifactId>
</dependency>
<dependency>
+ <groupId>org.msgpack</groupId>
+ <artifactId>msgpack-core</artifactId>
+ </dependency>
++ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </dependency>
</dependencies>
</project>
diff --cc hyracks-fullstack/pom.xml
index d7b6829,aabf956..bb20422
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -284,10 -306,10 +306,15 @@@
<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>