Return-Path: X-Original-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BFB418FF1 for ; Sat, 27 Feb 2016 02:27:28 +0000 (UTC) Received: (qmail 15665 invoked by uid 500); 27 Feb 2016 02:27:28 -0000 Delivered-To: apmail-asterixdb-notifications-archive@asterixdb.apache.org Received: (qmail 15630 invoked by uid 500); 27 Feb 2016 02:27:28 -0000 Mailing-List: contact notifications-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list notifications@asterixdb.incubator.apache.org Received: (qmail 15621 invoked by uid 99); 27 Feb 2016 02:27:27 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Feb 2016 02:27:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 72F6D1A0900 for ; Sat, 27 Feb 2016 02:27:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.919 X-Spam-Level: X-Spam-Status: No, score=0.919 tagged_above=-999 required=6.31 tests=[SPF_FAIL=0.919] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id pYCvdwOkRQtt for ; Sat, 27 Feb 2016 02:27:17 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id B3E405F5CD for ; Sat, 27 Feb 2016 02:27:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id 83D9C2419F8; Fri, 26 Feb 2016 18:22:41 -0800 (PST) Date: Fri, 26 Feb 2016 18:22:41 -0800 From: "Ian Maxon (Code Review)" Message-ID: Reply-To: imaxon@apache.org X-Gerrit-MessageType: newchange Subject: Change in hyracks[master]: Merge release-0.2.17 and master X-Gerrit-Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769147 X-Gerrit-ChangeURL: X-Gerrit-Commit: 3710264c15b2f76b4bec33379ba06732888dc5ce MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.8.4 To: undisclosed-recipients:; Ian Maxon has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/675 Change subject: Merge release-0.2.17 and master ...................................................................... Merge release-0.2.17 and master Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769147 --- M algebricks/algebricks-compiler/pom.xml M algebricks/algebricks-core/pom.xml D algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteOperator.java M algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java M algebricks/algebricks-data/pom.xml M algebricks/algebricks-examples/pom.xml M hyracks/hyracks-api/pom.xml M hyracks/hyracks-comm/pom.xml M hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks/hyracks-control/hyracks-control-common/pom.xml M hyracks/hyracks-control/hyracks-control-nc/pom.xml M hyracks/hyracks-data/hyracks-data-std/pom.xml M hyracks/hyracks-dataflow-common/pom.xml M hyracks/hyracks-dataflow-std/pom.xml M hyracks/hyracks-examples/btree-example/btreehelper/pom.xml M hyracks/hyracks-examples/hyracks-integration-tests/pom.xml M hyracks/hyracks-examples/text-example/texthelper/pom.xml M hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml M hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml M hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml M hyracks/hyracks-ipc/pom.xml M hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml M hyracks/hyracks-storage-am-btree/pom.xml M hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml M hyracks/hyracks-storage-am-lsm-rtree/pom.xml M hyracks/hyracks-storage-am-rtree/pom.xml M hyracks/hyracks-storage-common/pom.xml M hyracks/hyracks-test-support/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml M hyracks/hyracks-util/pom.xml M hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml M pom.xml 39 files changed, 42 insertions(+), 1,202 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/75/675/1 diff --git a/algebricks/algebricks-compiler/pom.xml b/algebricks/algebricks-compiler/pom.xml index 5ac15e4..77b0d5a 100644 --- a/algebricks/algebricks-compiler/pom.xml +++ b/algebricks/algebricks-compiler/pom.xml @@ -37,27 +37,6 @@ -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - ${basedir}/../.. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/algebricks/algebricks-core/pom.xml b/algebricks/algebricks-core/pom.xml index 2632fbb..9b05a82 100644 --- a/algebricks/algebricks-core/pom.xml +++ b/algebricks/algebricks-core/pom.xml @@ -37,27 +37,6 @@ -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - ${basedir}/../.. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteOperator.java b/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteOperator.java deleted file mode 100644 index 8e78952..0000000 --- a/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/IndexInsertDeleteOperator.java +++ /dev/null @@ -1,159 +0,0 @@ -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= -/* - * 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. - */ -package org.apache.hyracks.algebricks.core.algebra.operators.logical; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.mutable.Mutable; -import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; -import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; -import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; -import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; -import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex; -import org.apache.hyracks.algebricks.core.algebra.operators.logical.InsertDeleteOperator.Kind; -import org.apache.hyracks.algebricks.core.algebra.properties.VariablePropagationPolicy; -import org.apache.hyracks.algebricks.core.algebra.typing.ITypingContext; -import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionReferenceTransform; -import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalOperatorVisitor; - -public class IndexInsertDeleteOperator extends AbstractLogicalOperator { - - private final IDataSourceIndex dataSourceIndex; - private final List> primaryKeyExprs; - // In the bulk-load case on ngram or keyword index, - // it contains [token, number of token] or [token]. - // Otherwise, it contains secondary key information. - private final List> secondaryKeyExprs; - private final Mutable filterExpr; - private final Kind operation; - private final boolean bulkload; - private List> additionalFilteringExpressions; - - public IndexInsertDeleteOperator(IDataSourceIndex dataSourceIndex, - List> primaryKeyExprs, List> secondaryKeyExprs, - Mutable filterExpr, Kind operation, boolean bulkload) { - this.dataSourceIndex = dataSourceIndex; - this.primaryKeyExprs = primaryKeyExprs; - this.secondaryKeyExprs = secondaryKeyExprs; - this.filterExpr = filterExpr; - this.operation = operation; - this.bulkload = bulkload; - } - - @Override - public void recomputeSchema() throws AlgebricksException { - schema = new ArrayList(); - schema.addAll(inputs.get(0).getValue().getSchema()); - } - - @Override - public boolean acceptExpressionTransform(ILogicalExpressionReferenceTransform visitor) throws AlgebricksException { - boolean b = false; - for (int i = 0; i < primaryKeyExprs.size(); i++) { - if (visitor.transform(primaryKeyExprs.get(i))) { - b = true; - } - } - for (int i = 0; i < secondaryKeyExprs.size(); i++) { - if (visitor.transform(secondaryKeyExprs.get(i))) { - b = true; - } - } - if (filterExpr != null) { - if (visitor.transform(filterExpr)) { - b = true; - } - } - if (additionalFilteringExpressions != null) { - for (int i = 0; i < additionalFilteringExpressions.size(); i++) { - if (visitor.transform(additionalFilteringExpressions.get(i))) { - b = true; - } - } - } - return b; - } - - @Override - public R accept(ILogicalOperatorVisitor visitor, T arg) throws AlgebricksException { - return visitor.visitIndexInsertDeleteOperator(this, arg); - } - - @Override - public boolean isMap() { - return false; - } - - @Override - public VariablePropagationPolicy getVariablePropagationPolicy() { - return VariablePropagationPolicy.ALL; - } - - @Override - public LogicalOperatorTag getOperatorTag() { - return LogicalOperatorTag.INDEX_INSERT_DELETE; - } - - @Override - public IVariableTypeEnvironment computeOutputTypeEnvironment(ITypingContext ctx) throws AlgebricksException { - return createPropagatingAllInputsTypeEnvironment(ctx); - } - - public List> getPrimaryKeyExpressions() { - return primaryKeyExprs; - } - - public IDataSourceIndex getDataSourceIndex() { - return dataSourceIndex; - } - - public String getIndexName() { - return dataSourceIndex.getId().toString(); - } - - public List> getSecondaryKeyExpressions() { - return secondaryKeyExprs; - } - - public Mutable getFilterExpression() { - return filterExpr; - } - - public Kind getOperation() { - return operation; - } - - public boolean isBulkload() { - return bulkload; - } - - public void setAdditionalFilteringExpressions(List> additionalFilteringExpressions) { - this.additionalFilteringExpressions = additionalFilteringExpressions; - } - - public List> getAdditionalFilteringExpressions() { - return additionalFilteringExpressions; - } - -} ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java b/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java index 2f12420..ca35284 100644 --- a/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java +++ b/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java @@ -364,27 +364,12 @@ public String visitInsertDeleteUpsertOperator(InsertDeleteUpsertOperator op, Integer indent) throws AlgebricksException { StringBuilder buffer = new StringBuilder(); -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) String header = getIndexOpString(op.getOperation()); addIndent(buffer, indent).append(header).append(op.getDataSource()).append(" from ") .append(op.getPayloadExpression().getValue().accept(exprVisitor, indent)).append(" partitioned by "); -======= - if (op.getOperation() == Kind.INSERT) - addIndent(buffer, indent).append("insert ") - .append(op.getPayloadExpression().getValue().accept(exprVisitor, indent)).append(" into "); - else - addIndent(buffer, indent).append("delete from "); - buffer.append(op.getDataSource()).append(" partitioned by "); ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) pprintExprList(op.getPrimaryKeyExpressions(), buffer, indent); -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) if (op.getOperation() == Kind.UPSERT) { buffer.append(" out: ([" + op.getPrevRecordVar() + "] <-{record-before-upsert}) "); -======= - if (op.getAdditionalFilteringExpressions() != null) { - buffer.append(" filtered by "); - pprintExprList(op.getAdditionalFilteringExpressions(), buffer, indent); ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) } if (op.isBulkload()) { buffer.append(" [bulkload]"); @@ -396,7 +381,6 @@ public String visitIndexInsertDeleteUpsertOperator(IndexInsertDeleteUpsertOperator op, Integer indent) throws AlgebricksException { StringBuilder buffer = new StringBuilder(); -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) String header = getIndexOpString(op.getOperation()); addIndent(buffer, indent).append(header).append(op.getIndexName()).append(" on ") .append(op.getDataSourceIndex().getDataSource()).append(" from "); @@ -407,19 +391,6 @@ pprintExprList(op.getSecondaryKeyExpressions(), buffer, indent); } else { pprintExprList(op.getSecondaryKeyExpressions(), buffer, indent); -======= - addIndent(buffer, indent).append(op.getOperation() == Kind.INSERT ? "insert " : "delete "); - pprintExprList(op.getSecondaryKeyExpressions(), buffer, indent); - buffer.append(op.getOperation() == Kind.INSERT ? " into " : " from ").append(op.getIndexName()).append(" on ") - .append(op.getDataSourceIndex().getDataSource()).append(" partitioned by "); - pprintExprList(op.getPrimaryKeyExpressions(), buffer, indent); - if (op.getFilterExpression() != null || op.getAdditionalFilteringExpressions() != null) { - buffer.append(" filtered by "); - if (op.getFilterExpression() != null) - buffer.append(op.getFilterExpression().getValue().accept(exprVisitor, indent)); - if (op.getAdditionalFilteringExpressions() != null) - pprintExprList(op.getAdditionalFilteringExpressions(), buffer, indent); ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) } if (op.isBulkload()) { buffer.append(" [bulkload]"); @@ -522,17 +493,4 @@ } sb.append("]"); } -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - @Override - public String visitExternalDataLookupOperator(ExternalDataLookupOperator op, Integer indent) - throws AlgebricksException { - StringBuilder buffer = new StringBuilder(); - addIndent(buffer, indent) - .append("external-instant-lookup " + op.getVariables() + " <- " + op.getExpressionRef().getValue()); - return buffer.toString(); - } - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) } diff --git a/algebricks/algebricks-data/pom.xml b/algebricks/algebricks-data/pom.xml index eb481da..c7bdeb6 100644 --- a/algebricks/algebricks-data/pom.xml +++ b/algebricks/algebricks-data/pom.xml @@ -37,27 +37,6 @@ -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - ${basedir}/../.. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/algebricks/algebricks-examples/pom.xml b/algebricks/algebricks-examples/pom.xml index 1ad6582..769cc85 100644 --- a/algebricks/algebricks-examples/pom.xml +++ b/algebricks/algebricks-examples/pom.xml @@ -49,7 +49,4 @@ ${basedir}/../.. - - piglet-example - diff --git a/hyracks/hyracks-api/pom.xml b/hyracks/hyracks-api/pom.xml index 6e95999..8324f61 100644 --- a/hyracks/hyracks-api/pom.xml +++ b/hyracks/hyracks-api/pom.xml @@ -36,10 +36,6 @@ - - ${basedir}/../.. - - diff --git a/hyracks/hyracks-comm/pom.xml b/hyracks/hyracks-comm/pom.xml index 0cff357..f0b0cad 100644 --- a/hyracks/hyracks-comm/pom.xml +++ b/hyracks/hyracks-comm/pom.xml @@ -36,10 +36,6 @@ - - ${basedir}/../.. - - diff --git a/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 5975e88..904b5f3 100644 --- a/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -27,27 +27,7 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/hyracks/hyracks-control/hyracks-control-common/pom.xml b/hyracks/hyracks-control/hyracks-control-common/pom.xml index f9028e4..88f0fbd 100644 --- a/hyracks/hyracks-control/hyracks-control-common/pom.xml +++ b/hyracks/hyracks-control/hyracks-control-common/pom.xml @@ -27,27 +27,7 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/hyracks/hyracks-control/hyracks-control-nc/pom.xml b/hyracks/hyracks-control/hyracks-control-nc/pom.xml index a648e2c..9193052 100644 --- a/hyracks/hyracks-control/hyracks-control-nc/pom.xml +++ b/hyracks/hyracks-control/hyracks-control-nc/pom.xml @@ -27,27 +27,7 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/hyracks/hyracks-data/hyracks-data-std/pom.xml b/hyracks/hyracks-data/hyracks-data-std/pom.xml index 0b91a4d..4f250ac 100644 --- a/hyracks/hyracks-data/hyracks-data-std/pom.xml +++ b/hyracks/hyracks-data/hyracks-data-std/pom.xml @@ -23,64 +23,29 @@ hyracks-data-std hyracks-data-std -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) org.apache.hyracks hyracks-data - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT -======= - - org.apache.hyracks - hyracks-data - 0.2.18-SNAPSHOT - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) org.apache.hyracks hyracks-util - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT org.apache.hyracks hyracks-api - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT org.apache.hyracks hyracks-util - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT test-jar test -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - ${basedir}/../../.. - - - - org.apache.hyracks - hyracks-api - 0.2.18-SNAPSHOT - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-dataflow-common/pom.xml b/hyracks/hyracks-dataflow-common/pom.xml index aaacc18..e040430 100644 --- a/hyracks/hyracks-dataflow-common/pom.xml +++ b/hyracks/hyracks-dataflow-common/pom.xml @@ -17,7 +17,6 @@ ! under the License. !--> -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) 4.0.0 @@ -26,21 +25,9 @@ org.apache.hyracks hyracks - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT -======= - - 4.0.0 - hyracks-dataflow-common - hyracks-dataflow-common - - org.apache.hyracks - hyracks - 0.2.18-SNAPSHOT - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) Apache License, Version 2.0 @@ -49,52 +36,37 @@ A business-friendly OSS license -======= - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - ${basedir}/../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) - -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) org.apache.hyracks hyracks-util - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT org.apache.hyracks hyracks-util - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT test-jar test org.apache.hyracks hyracks-api - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT jar compile org.apache.hyracks hyracks-data-std - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT org.apache.hyracks hyracks-control-nc - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT test @@ -102,40 +74,4 @@ commons-io -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - - org.apache.hyracks - hyracks-api - 0.2.18-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-data-std - 0.2.18-SNAPSHOT - - - org.apache.hyracks - hyracks-control-nc - 0.2.18-SNAPSHOT - test - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-dataflow-std/pom.xml b/hyracks/hyracks-dataflow-std/pom.xml index d9a80a1..15b9aa5 100644 --- a/hyracks/hyracks-dataflow-std/pom.xml +++ b/hyracks/hyracks-dataflow-std/pom.xml @@ -23,19 +23,11 @@ hyracks-dataflow-std hyracks-dataflow-std -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - org.apache.hyracks - hyracks - 0.2.17-SNAPSHOT - -======= org.apache.hyracks hyracks 0.2.18-SNAPSHOT ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) @@ -50,48 +42,6 @@ ${basedir}/../.. -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - - org.apache.hyracks - hyracks-api - 0.2.17-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-dataflow-common - 0.2.17-SNAPSHOT - jar - compile - - - commons-io - commons-io - - - org.apache.hyracks - hyracks-control-nc - 0.2.17-SNAPSHOT - test - - -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - org.apache.hyracks @@ -118,5 +68,4 @@ test ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml b/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml index 4a43695..ad3fd1e 100644 --- a/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml +++ b/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml @@ -58,29 +58,4 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 9ccfce1..9b584ad 100644 --- a/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -27,33 +27,6 @@ hyracks-examples 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks @@ -123,21 +96,12 @@ hyracks-data-std 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - org.apache.hyracks - hyracks-client - 0.2.17-SNAPSHOT - jar - compile - com.e-movimento.tinytools privilegedaccessor 1.2.2 test -======= org.apache.hyracks hyracks-client @@ -145,6 +109,5 @@ jar compile ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-examples/text-example/texthelper/pom.xml b/hyracks/hyracks-examples/text-example/texthelper/pom.xml index 36e72d1..17ab49a 100644 --- a/hyracks/hyracks-examples/text-example/texthelper/pom.xml +++ b/hyracks/hyracks-examples/text-example/texthelper/pom.xml @@ -28,10 +28,6 @@ 0.2.18-SNAPSHOT - - ${basedir}/../../../.. - - org.apache.hyracks @@ -51,21 +47,8 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - org.apache.maven.plugins maven-deploy-plugin @@ -75,5 +58,4 @@ ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml b/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml index 35027b1..2bd71c8 100644 --- a/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml +++ b/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml @@ -32,83 +32,6 @@ ${basedir}/../../../../.. -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - - org.apache.hyracks - hyracks-dataflow-std - 0.2.17-SNAPSHOT - compile - - - org.apache.hyracks - hyracks-data-std - 0.2.17-SNAPSHOT - - - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.3 - - - sort - - - - org.apache.hyracks.examples.tpch.client.Sort - sort - - - flat - lib - - package - - assemble - - - - group - - - - org.apache.hyracks.examples.tpch.client.Groupby - group - - - flat - lib - - package - - assemble - - - - join - - - - org.apache.hyracks.examples.tpch.client.Join - join - - - flat - lib - - package - - assemble - - - - - - -======= org.apache.hyracks @@ -124,16 +47,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - org.codehaus.mojo appassembler-maven-plugin @@ -166,5 +79,4 @@ ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml b/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml index 5e6db50..d4fe42f 100644 --- a/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml +++ b/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml @@ -26,28 +26,8 @@ org.apache.hyracks 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - ${basedir}/../../.. - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml b/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml index 1ddb32b..89ec756 100644 --- a/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml +++ b/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml @@ -26,26 +26,6 @@ org.apache.hyracks 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - ${basedir}/../../.. - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-ipc/pom.xml b/hyracks/hyracks-ipc/pom.xml index 064b94b..4e16c70 100644 --- a/hyracks/hyracks-ipc/pom.xml +++ b/hyracks/hyracks-ipc/pom.xml @@ -37,27 +37,7 @@ -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - ${basedir}/../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) junit diff --git a/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml b/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml index 7ff725c..da9697f 100644 --- a/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml +++ b/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml @@ -29,26 +29,5 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - ${basedir}/../../.. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-storage-am-btree/pom.xml b/hyracks/hyracks-storage-am-btree/pom.xml index 9bf70f6..4a41a39 100644 --- a/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks/hyracks-storage-am-btree/pom.xml @@ -17,25 +17,6 @@ ! under the License. !--> -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - 4.0.0 - hyracks-storage-am-btree - hyracks-storage-am-btree - - org.apache.hyracks - hyracks - 0.2.17-SNAPSHOT - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - -======= 4.0.0 hyracks-storage-am-btree hyracks-storage-am-btree @@ -55,62 +36,35 @@ - - ${basedir}/../.. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - org.apache.hyracks - hyracks-storage-common - 0.2.18-SNAPSHOT - jar - compile - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) + + org.apache.hyracks + hyracks-storage-common + 0.2.18-SNAPSHOT + jar + compile + -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - org.apache.hyracks - hyracks-storage-common - 0.2.17-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-storage-am-common - 0.2.17-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-dataflow-common - 0.2.17-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-dataflow-std - 0.2.17-SNAPSHOT - jar - compile - + org.apache.hyracks + hyracks-storage-am-common + 0.2.18-SNAPSHOT + jar + compile + + + org.apache.hyracks + hyracks-dataflow-common + 0.2.18-SNAPSHOT + jar + compile + + + org.apache.hyracks + hyracks-dataflow-std + 0.2.18-SNAPSHOT + jar + compile + org.mockito mockito-all @@ -128,29 +82,5 @@ 1.6.2 test - - -======= - org.apache.hyracks - hyracks-storage-am-common - 0.2.18-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-dataflow-common - 0.2.18-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-dataflow-std - 0.2.18-SNAPSHOT - jar - compile - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml b/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml index b36213a..4d000f7 100644 --- a/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml +++ b/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml @@ -22,32 +22,13 @@ 4.0.0 hyracks-storage-am-lsm-invertedindex -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - hyracks - org.apache.hyracks - 0.2.17-SNAPSHOT - .. - -======= hyracks org.apache.hyracks 0.2.18-SNAPSHOT .. ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - -======= Apache License, Version 2.0 @@ -60,44 +41,7 @@ ${basedir}/../.. ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - - org.apache.hyracks - hyracks-util - 0.2.17-SNAPSHOT - - - org.apache.hyracks - hyracks-storage-am-btree - 0.2.17-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-storage-am-lsm-common - 0.2.17-SNAPSHOT - jar - compile - - -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - - - org.apache.hyracks @@ -114,5 +58,4 @@ compile ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-storage-am-lsm-rtree/pom.xml b/hyracks/hyracks-storage-am-lsm-rtree/pom.xml index 317e4dd..8766c9f 100644 --- a/hyracks/hyracks-storage-am-lsm-rtree/pom.xml +++ b/hyracks/hyracks-storage-am-lsm-rtree/pom.xml @@ -36,11 +36,6 @@ - - ${basedir}/../.. - - - org.apache.hyracks diff --git a/hyracks/hyracks-storage-am-rtree/pom.xml b/hyracks/hyracks-storage-am-rtree/pom.xml index 19214aa..7688122 100644 --- a/hyracks/hyracks-storage-am-rtree/pom.xml +++ b/hyracks/hyracks-storage-am-rtree/pom.xml @@ -37,10 +37,6 @@ - - ${basedir}/../.. - - diff --git a/hyracks/hyracks-storage-common/pom.xml b/hyracks/hyracks-storage-common/pom.xml index ad4d3a9..1f58345 100644 --- a/hyracks/hyracks-storage-common/pom.xml +++ b/hyracks/hyracks-storage-common/pom.xml @@ -37,27 +37,7 @@ -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - - - - - ${basedir}/../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/hyracks/hyracks-test-support/pom.xml b/hyracks/hyracks-test-support/pom.xml index 8087ea8..55d5d56 100644 --- a/hyracks/hyracks-test-support/pom.xml +++ b/hyracks/hyracks-test-support/pom.xml @@ -37,10 +37,6 @@ - - ${basedir}/../.. - - junit diff --git a/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml index 8018c0c..06cfccf 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml @@ -27,19 +27,8 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - org.apache.maven.plugins maven-deploy-plugin @@ -49,11 +38,6 @@ - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml index cfed58e..bd9dec3 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml @@ -28,25 +28,8 @@ 0.2.18-SNAPSHOT - - ${basedir}/../.. - - -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - org.apache.maven.plugins maven-deploy-plugin @@ -57,7 +40,6 @@ ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hyracks diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml index d0be90d..8173e8d 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml @@ -27,19 +27,8 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - org.apache.maven.plugins maven-deploy-plugin @@ -49,11 +38,6 @@ - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml index 207bea4..fbde741 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml @@ -27,19 +27,8 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - org.apache.maven.plugins maven-deploy-plugin @@ -49,11 +38,6 @@ - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml index 76230a4..afefef8 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml @@ -22,65 +22,15 @@ 4.0.0 hyracks-storage-am-lsm-invertedindex-test -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - hyracks-tests - org.apache.hyracks - 0.2.17-SNAPSHOT - .. - -======= hyracks-tests org.apache.hyracks 0.2.18-SNAPSHOT .. ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - - org.apache.hyracks - hyracks-storage-am-lsm-invertedindex - 0.2.17-SNAPSHOT - jar - compile - - - org.apache.hyracks - hyracks-test-support - 0.2.17-SNAPSHOT - jar - test - - - org.apache.hyracks - hyracks-data-std - 0.2.17-SNAPSHOT - jar - test - - - org.apache.hyracks - hyracks-util - 0.2.17-SNAPSHOT - test-jar - test - - -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - org.apache.maven.plugins maven-deploy-plugin @@ -90,9 +40,6 @@ - - ${basedir}/../../.. - org.apache.hyracks @@ -116,6 +63,5 @@ test ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml index d423216..6b83283 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml @@ -27,19 +27,8 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - org.apache.maven.plugins maven-deploy-plugin @@ -49,11 +38,6 @@ - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml index a1443a2..1277bcb 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml @@ -28,20 +28,8 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - org.apache.maven.plugins maven-deploy-plugin @@ -51,11 +39,6 @@ - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml index dfe4838..0b0c576 100644 --- a/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml @@ -28,20 +28,8 @@ 0.2.18-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - true - - org.apache.maven.plugins maven-deploy-plugin @@ -51,11 +39,6 @@ - - - ${basedir}/../../.. - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) diff --git a/hyracks/hyracks-util/pom.xml b/hyracks/hyracks-util/pom.xml index ca38040..9bf3459 100644 --- a/hyracks/hyracks-util/pom.xml +++ b/hyracks/hyracks-util/pom.xml @@ -24,7 +24,7 @@ hyracks org.apache.hyracks - 0.2.17-SNAPSHOT + 0.2.18-SNAPSHOT 4.0.0 @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml b/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml index 4cc7326..b018477 100644 --- a/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml +++ b/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml @@ -26,27 +26,7 @@ 0.2.1-SNAPSHOT -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) -======= - - ${basedir}/../../.. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache.hadoop diff --git a/pom.xml b/pom.xml index fe2435a..f94eb8f 100644 --- a/pom.xml +++ b/pom.xml @@ -18,16 +18,6 @@ !--> -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) - - 4.0.0 - org.apache.hyracks - fullstack - 0.2.17-SNAPSHOT - pom - hyracks-ecosystem-full-stack -======= 4.0.0 org.apache.hyracks @@ -35,7 +25,6 @@ 0.2.18-SNAPSHOT pom hyracks-ecosystem-full-stack ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) org.apache @@ -52,7 +41,6 @@ -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) UTF-8 1.8 @@ -112,66 +100,6 @@ -======= - - UTF-8 - ${basedir} - - - **/pregelix/**/FailureRecovery*.java - **/hivesterix/perf/PerfTestSuite.java - **/*TestSuite.java,**/*Test.java - **/Abstract*.java,${hanging.pregelix.tests},${hivesterix.perf.tests} - - 2.2.0 - 4.8.1 - 2.4 - - - - - junit - junit - ${junit.version} - - - org.apache.hadoop - hadoop-yarn-client - ${hadoop.version} - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - - - org.apache.hadoop - hadoop-minicluster - ${hadoop.version} - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - commons-io - commons-io - ${commons.io.version} - - - ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) @@ -186,7 +114,7 @@ 0.11 - validate + test check @@ -217,7 +145,6 @@ false -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) **/algebricks-tests/src/test/resources/results/** **/javascript/flot/*.js **/javascript/jsplumb/*.js @@ -244,15 +171,13 @@ **/ClusterControllerService/** **/target/** **/output/** -======= ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) **/target/** **/*.iml -<<<<<<< HEAD (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.) **/*.prefs **/.classpath **/.project -======= + **/target/** + **/*.iml **/.classpath **/.project **/.settings/** @@ -281,7 +206,6 @@ hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/expected/part-0 hyracks/hyracks-storage-am-common/src/main/resources/dist.all.first.cleaned hyracks/hyracks-storage-am-common/src/main/resources/dist.all.last.cleaned ->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio) -- To view, visit https://asterix-gerrit.ics.uci.edu/675 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769147 Gerrit-PatchSet: 1 Gerrit-Project: hyracks Gerrit-Branch: master Gerrit-Owner: Ian Maxon