This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 1274022277e431c8e960d2280142e32a045a5349 Merge: c7dfaa3 1ff69c0 Author: Michael Blow <[email protected]> AuthorDate: Fri Jan 18 11:23:21 2019 -0500 Merge commit '1ff69c0' from 'stabilization-f69489' into 'master' Change-Id: Ic8aa90be3ba3645ad22d21cc54abc83ab7008598 asterixdb/asterix-app/pom.xml | 2 +- .../asterix/app/translator/QueryTranslator.java | 14 +++++- .../dataset_with_meta-6.1.ddl.aql | 37 ---------------- .../dataset_with_meta-6.2.update.aql | 19 -------- .../dataset_with_meta-6.3.query.aql | 22 ---------- .../dataset_with_meta-6.4.ddl.aql | 20 --------- .../dataset_with_meta-6.1.ddl.aql | 37 ---------------- .../dataset_with_meta-6.2.update.aql | 19 -------- .../dataset_with_meta-6.3.query.aql | 22 ---------- .../dataset_with_meta-6.4.ddl.aql | 20 --------- .../dataset_with_meta-6/dataset_with_meta-6.3.adm | 2 - .../dataset_with_meta-7/dataset_with_meta-7.3.adm | 2 - .../src/test/resources/metadata/testsuite.xml | 10 ----- .../meta/secondary_index-lojoin_with_meta-1.aql | 51 ---------------------- .../meta/secondary_index-nljoin_with_meta-3.aql | 40 ----------------- .../meta/secondary_index-nljoin_with_meta-4.aql | 43 ------------------ .../queries/meta/secondary_index_with_meta-1.aql | 39 ----------------- .../meta/secondary_index-lojoin_with_meta-1.plan | 47 -------------------- .../meta/secondary_index-nljoin_with_meta-3.plan | 23 ---------- .../meta/secondary_index-nljoin_with_meta-4.plan | 23 ---------- .../results/meta/secondary_index_with_meta-1.plan | 16 ------- .../test/resources/runtimets/testsuite_sqlpp.xml | 5 ++- asterixdb/asterix-common/pom.xml | 1 - .../apache/asterix/common/context/DatasetInfo.java | 5 ++- .../common/context/DatasetLifecycleManager.java | 8 ++-- .../org/apache/asterix/common/context/Info.java | 13 +++--- asterixdb/asterix-external-data/pom.xml | 6 +-- asterixdb/asterix-geo/pom.xml | 1 - .../pom.xml | 1 - .../asterix-grammar-extension-maven-plugin/pom.xml | 4 +- asterixdb/asterix-metadata/pom.xml | 1 - .../org/apache/asterix/metadata/MetadataNode.java | 3 +- asterixdb/asterix-om/pom.xml | 3 -- .../serde/ARecordSerializerDeserializer.java | 17 +++----- asterixdb/asterix-runtime/pom.xml | 3 +- .../records/FieldAccessByNameEvalFactory.java | 10 ++++- .../records/FieldAccessNestedEvalFactory.java | 11 ++++- .../records/GetRecordFieldValueEvalFactory.java | 10 ++++- asterixdb/asterix-server/pom.xml | 7 ++- asterixdb/asterix-transactions/pom.xml | 1 - asterixdb/pom.xml | 31 +++++++++---- .../appended-resources/supplemental-models.xml | 23 +++++----- .../opensource.org_licenses_mit-license.php.txt | 7 +++ ....com_netty_netty_netty-4.1.32.Final_NOTICE.txt} | 0 ...om_qos-ch_slf4j_v_1.7.25_slf4j-api_LICENSE.txt} | 2 +- hyracks-fullstack/hyracks/hyracks-api/pom.xml | 1 - .../hyracks-control/hyracks-control-cc/pom.xml | 1 - .../hyracks-integration-tests/pom.xml | 1 - hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 2 +- .../license-automation-plugin/pom.xml | 16 +++---- .../hyracks/maven/license/GenerateFileMojo.java | 2 +- .../maven/license/SourcePointerResolver.java | 10 +++++ .../hyracks/hyracks-maven-plugins/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 1 - .../hyracks/hyracks-storage-am-btree/pom.xml | 1 - .../hyracks-storage-am-lsm-common-test/pom.xml | 1 - hyracks-fullstack/pom.xml | 18 ++++---- 57 files changed, 150 insertions(+), 587 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-net/pom.xml index 2dca39b,3b7b20d..824098c --- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml @@@ -66,13 -61,8 +66,12 @@@ <version>${project.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>2.0.2-beta</version> <scope>test</scope> </dependency> </dependencies>
