Merge release-0.9.4 into master Change-Id:Ied2b685f015e0f35563ebd0510231a5d663494f4
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/44a7523d Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/44a7523d Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/44a7523d Branch: refs/heads/master Commit: 44a7523d0534c0466805d68d7c2a5af98313d624 Parents: 3477a2b 478eccb Author: Ian Maxon <[email protected]> Authored: Fri Oct 5 12:38:11 2018 -0700 Committer: Ian Maxon <[email protected]> Committed: Fri Oct 5 12:45:01 2018 -0700 ---------------------------------------------------------------------- asterixdb/asterix-active/pom.xml | 2 +- asterixdb/asterix-algebra/pom.xml | 2 +- asterixdb/asterix-app/pom.xml | 2 +- .../main/appended-resources/META-INF/LICENSE | 7 ++- 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 | 47 +++++++++++--------- asterixdb/asterix-examples/pom.xml | 2 +- asterixdb/asterix-external-data/pom.xml | 2 +- asterixdb/asterix-fuzzyjoin/pom.xml | 2 +- asterixdb/asterix-geo/pom.xml | 2 +- asterixdb/asterix-hivecompat/pom.xml | 2 +- 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 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../lexer-generator-maven-plugin/pom.xml | 2 +- asterixdb/asterix-maven-plugins/pom.xml | 2 +- .../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/assembly/binary-assembly.xml | 20 ++++----- .../apache/asterix/test/server/LicensingIT.java | 5 +++ .../apache/asterix/test/server/RecoveryIT.java | 15 +++---- .../test/server/SampleLocalClusterIT.java | 10 +++-- .../big_object_20M/big_object_20M.3.update.aql | 2 +- .../primary_index_only.3.update.aql | 2 +- .../primary_index_only_filtered.3.update.aql | 2 +- ...ary_plus_correlated_ngram_index.3.update.aql | 2 +- ...ary_plus_correlated_rtree_index.3.update.aql | 2 +- ...ault_correlated_secondary_index.3.update.aql | 2 +- ...ry_plus_default_secondary_index.3.update.aql | 2 +- ...efault_secondary_index_filtered.3.update.aql | 2 +- ...word_correlated_secondary_index.3.update.aql | 2 +- ...ry_plus_keyword_secondary_index.3.update.aql | 2 +- ...eyword_secondary_index_filtered.3.update.aql | 2 +- ...le_correlated_secondary_indices.3.update.aql | 2 +- ...plus_multiple_secondary_indices.3.update.aql | 2 +- ...iple_secondary_indices_filtered.3.update.aql | 2 +- .../primary_plus_ngram_index.3.update.aql | 2 +- ...imary_plus_ngram_index_filtered.3.update.aql | 2 +- .../primary_plus_rtree_index.3.update.aql | 2 +- ...imary_plus_rtree_index_filtered.3.update.aql | 2 +- ...s_rtree_index_insert_and_delete.3.update.aql | 2 +- ...ndex_insert_and_delete_filtered.3.update.aql | 2 +- .../delete_after_recovery.3.update.aql | 2 +- .../insert_after_recovery.3.update.aql | 2 +- .../load_after_recovery.5.update.aql | 2 +- asterixdb/asterix-test-framework/pom.xml | 2 +- asterixdb/asterix-tools/pom.xml | 2 +- asterixdb/asterix-transactions/pom.xml | 2 +- asterixdb/pom.xml | 7 +-- .../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/hyracks-client/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-comm/pom.xml | 2 +- .../hyracks-control/hyracks-control-cc/pom.xml | 2 +- .../hyracks-control-common/pom.xml | 2 +- .../hyracks-control/hyracks-control-nc/pom.xml | 2 +- .../hyracks-control/hyracks-nc-service/pom.xml | 2 +- .../hyracks/hyracks-control/pom.xml | 2 +- .../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-examples/btree-example/pom.xml | 2 +- .../hyracks-integration-tests/pom.xml | 2 +- .../hyracks-shutdown-test/pom.xml | 2 +- .../hyracks/hyracks-examples/pom.xml | 2 +- .../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-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 | 2 +- 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/hyracks-server/pom.xml | 2 +- .../hyracks-storage-am-bloomfilter/pom.xml | 2 +- .../hyracks/hyracks-storage-am-btree/pom.xml | 2 +- .../hyracks/hyracks-storage-am-common/pom.xml | 2 +- .../hyracks-storage-am-lsm-btree/pom.xml | 2 +- .../hyracks-storage-am-lsm-common/pom.xml | 2 +- .../pom.xml | 2 +- .../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/test/support/LicensingTestBase.java | 17 +++++-- .../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 | 2 +- pom.xml | 2 +- 131 files changed, 202 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-active/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-app/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-dashboard/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-doc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-external-data/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-geo/pom.xml ---------------------------------------------------------------------- diff --cc asterixdb/asterix-geo/pom.xml index 671e57e,0000000..8c891e6 mode 100644,000000..100644 --- a/asterixdb/asterix-geo/pom.xml +++ b/asterixdb/asterix-geo/pom.xml @@@ -1,147 -1,0 +1,147 @@@ +<!-- + ! Licensed to the Apache Software Foundation (ASF) under one + ! or more contributor license agreements. See the NOTICE file + ! distributed with this work for additional information + ! regarding copyright ownership. The ASF licenses this file + ! to you under the Apache License, Version 2.0 (the + ! "License"); you may not use this file except in compliance + ! with the License. You may obtain a copy of the License at + ! + ! http://www.apache.org/licenses/LICENSE-2.0 + ! + ! Unless required by applicable law or agreed to in writing, + ! software distributed under the License is distributed on an + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ! KIND, either express or implied. See the License for the + ! specific language governing permissions and limitations + ! under the License. + !--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>apache-asterixdb</artifactId> + <groupId>org.apache.asterix</groupId> - <version>0.9.4-SNAPSHOT</version> ++ <version>0.9.5-SNAPSHOT</version> + </parent> + <artifactId>asterix-geo</artifactId> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> + + <properties> + <root.dir>${basedir}/..</root.dir> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-evaluator-generator-maven-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <evaluatorPackagePrefix>org.apache.asterix.runtime.evaluators</evaluatorPackagePrefix> + </configuration> + <executions> + <execution> + <id>generate-evaluator</id> + <phase>process-classes</phase> + <goals> + <goal>generate-evaluator</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + <phase>test-compile</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <excludes combine.children="append"> + <exclude>data/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-runtime</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.esri.geometry</groupId> + <artifactId>esri-geometry-api</artifactId> + <version>2.0.0</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-lang-common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-lang-sqlpp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-metadata/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-om/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-runtime/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SampleLocalClusterIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-test-framework/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/asterix-transactions/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/asterixdb/pom.xml ---------------------------------------------------------------------- diff --cc asterixdb/pom.xml index 0c7c19d,a3ada4f..9bf7533 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -73,9 -73,9 +73,9 @@@ <itest.excludes>${global.itest.excludes}</itest.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.4-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.4-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.5-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.5-SNAPSHOT</hyracks.version> - <hadoop.version>2.2.0</hadoop.version> + <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/algebricks/algebricks-core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-http/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java index e2ab3a3,159df9e..9e52785 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java @@@ -37,10 -37,14 +37,19 @@@ public abstract class LicensingTestBas final String pattern = getInstallerDirPattern(); final String targetDir = getTargetDir(); final String[] list = new File(targetDir).list((dir, name) -> name.matches(pattern)); + final String topLevelPattern = getTopLevelDirPattern(); - final String[] topLevel = - new File(FileUtil.joinPath(targetDir, list[0])).list((dir, name) -> name.matches(topLevelPattern)); ++ String[] topLevel; ++ if (topLevelPattern == null) { ++ topLevel = new String[] { "" }; ++ } else { ++ topLevel = new File(FileUtil.joinPath(targetDir, list[0])) ++ .list((dir, name) -> name.matches(topLevelPattern)); ++ } + installerDir = FileUtil.joinPath(targetDir, list[0], topLevel[0]); Assert.assertNotNull("installerDir", list); - Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + Arrays.toString(list), list.length > 1); - Assert.assertEquals("Can't find install dir (" + pattern + ")", 1, list.length); - installerDir = FileUtil.joinPath(targetDir, list[0]); + Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + Arrays.toString(topLevel), + list.length > 1); + Assert.assertEquals("Can't find install dir (" + pattern + ")", 1, topLevel.length); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/hyracks-util/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/hyracks/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/44a7523d/hyracks-fullstack/pom.xml ----------------------------------------------------------------------
