asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ian Maxon (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in hyracks[master]: Merge release-0.2.17 and master
Date Sat, 27 Feb 2016 02:22:41 GMT
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 @@
     </license>
   </licenses>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   <dependency>
   	<groupId>org.apache.hyracks</groupId>
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 @@
     </license>
   </licenses>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   <dependency>
   	<groupId>org.apache.hyracks</groupId>
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<Mutable<ILogicalExpression>> 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<Mutable<ILogicalExpression>> secondaryKeyExprs;
-    private final Mutable<ILogicalExpression> filterExpr;
-    private final Kind operation;
-    private final boolean bulkload;
-    private List<Mutable<ILogicalExpression>> additionalFilteringExpressions;
-
-    public IndexInsertDeleteOperator(IDataSourceIndex<?, ?> dataSourceIndex,
-            List<Mutable<ILogicalExpression>> primaryKeyExprs, List<Mutable<ILogicalExpression>> secondaryKeyExprs,
-            Mutable<ILogicalExpression> 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<LogicalVariable>();
-        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, T> R accept(ILogicalOperatorVisitor<R, T> 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<Mutable<ILogicalExpression>> getPrimaryKeyExpressions() {
-        return primaryKeyExprs;
-    }
-
-    public IDataSourceIndex<?, ?> getDataSourceIndex() {
-        return dataSourceIndex;
-    }
-
-    public String getIndexName() {
-        return dataSourceIndex.getId().toString();
-    }
-
-    public List<Mutable<ILogicalExpression>> getSecondaryKeyExpressions() {
-        return secondaryKeyExprs;
-    }
-
-    public Mutable<ILogicalExpression> getFilterExpression() {
-        return filterExpr;
-    }
-
-    public Kind getOperation() {
-        return operation;
-    }
-
-    public boolean isBulkload() {
-        return bulkload;
-    }
-
-    public void setAdditionalFilteringExpressions(List<Mutable<ILogicalExpression>> additionalFilteringExpressions) {
-        this.additionalFilteringExpressions = additionalFilteringExpressions;
-    }
-
-    public List<Mutable<ILogicalExpression>> 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 @@
     </license>
   </licenses>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   <dependency>
   	<groupId>org.apache.hyracks</groupId>
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 @@
       <root.dir>${basedir}/../..</root.dir>
   </properties>
 
-  <modules>
-    <module>piglet-example</module>
-  </modules>
 </project>
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 @@
     </license>
   </licenses>
 
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
 
   <dependencies>
   	<dependency>
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 @@
     </license>
   </licenses>
 
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
 
   <dependencies>
  <dependency>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
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 @@
     <artifactId>hyracks-data-std</artifactId>
     <name>hyracks-data-std</name>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
     <parent>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>hyracks-data</artifactId>
-        <version>0.2.17-SNAPSHOT</version>
+        <version>0.2.18-SNAPSHOT</version>
     </parent>
-=======
-  <parent>
-    <groupId>org.apache.hyracks</groupId>
-    <artifactId>hyracks-data</artifactId>
-    <version>0.2.18-SNAPSHOT</version>
-  </parent>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
     <dependencies>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-util</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-api</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-util</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
-  <dependencies>
-  <dependency>
-  	<groupId>org.apache.hyracks</groupId>
-  	<artifactId>hyracks-api</artifactId>
-  	<version>0.2.18-SNAPSHOT</version>
-  </dependency>
-  </dependencies>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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.)
 <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>
@@ -26,21 +25,9 @@
     <parent>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>hyracks</artifactId>
-        <version>0.2.17-SNAPSHOT</version>
+        <version>0.2.18-SNAPSHOT</version>
     </parent>
-=======
-<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>
-  <artifactId>hyracks-dataflow-common</artifactId>
-  <name>hyracks-dataflow-common</name>
-  <parent>
-    <groupId>org.apache.hyracks</groupId>
-    <artifactId>hyracks</artifactId>
-    <version>0.2.18-SNAPSHOT</version>
-  </parent>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -49,52 +36,37 @@
             <comments>A business-friendly OSS license</comments>
         </license>
     </licenses>
-=======
-  <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>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
-
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
     <dependencies>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-util</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-util</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-api</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-data-std</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-control-nc</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
+            <version>0.2.18-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -102,40 +74,4 @@
             <artifactId>commons-io</artifactId>
         </dependency>
     </dependencies>
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-  	<dependency>
-  		<groupId>org.apache.hyracks</groupId>
-  		<artifactId>hyracks-api</artifactId>
-  		<version>0.2.18-SNAPSHOT</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.hyracks</groupId>
-  		<artifactId>hyracks-data-std</artifactId>
-  		<version>0.2.18-SNAPSHOT</version>
-    </dependency>
-   	<dependency>
-  		<groupId>org.apache.hyracks</groupId>
-  		<artifactId>hyracks-control-nc</artifactId>
-  		<version>0.2.18-SNAPSHOT</version>
-        <scope>test</scope>
-  	</dependency>
-  </dependencies>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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 @@
     <artifactId>hyracks-dataflow-std</artifactId>
     <name>hyracks-dataflow-std</name>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <parent>
-        <groupId>org.apache.hyracks</groupId>
-        <artifactId>hyracks</artifactId>
-        <version>0.2.17-SNAPSHOT</version>
-    </parent>
-=======
   <parent>
     <groupId>org.apache.hyracks</groupId>
     <artifactId>hyracks</artifactId>
     <version>0.2.18-SNAPSHOT</version>
   </parent>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
     <licenses>
         <license>
@@ -50,48 +42,6 @@
       <root.dir>${basedir}/../..</root.dir>
   </properties>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-api</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-common</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-control-nc</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
@@ -118,5 +68,4 @@
           <scope>test</scope>
       </dependency>
   </dependencies>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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 @@
   		<version>0.2.18-SNAPSHOT</version>
   	</dependency>
   </dependencies>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-      <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-deploy-plugin</artifactId>
-      <configuration>
-          <skip>true</skip>
-      </configuration>
-    </plugin>
-    </plugins>
-  </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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 @@
 		<artifactId>hyracks-examples</artifactId>
 		<version>0.2.18-SNAPSHOT</version>
 	</parent>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-
-=======
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				 <configuration>
-					<skip>true</skip>
-				 </configuration>
-				</plugin>
-		</plugins>
-	</build>
-	<properties>
-			<root.dir>${basedir}/../../..</root.dir>
-	</properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.hyracks</groupId>
@@ -123,21 +96,12 @@
 			<artifactId>hyracks-data-std</artifactId>
 			<version>0.2.18-SNAPSHOT</version>
 		</dependency>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-  	    <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-client</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.e-movimento.tinytools</groupId>
             <artifactId>privilegedaccessor</artifactId>
             <version>1.2.2</version>
             <scope>test</scope>
         </dependency>
-=======
   		 <dependency>
 				<groupId>org.apache.hyracks</groupId>
 				<artifactId>hyracks-client</artifactId>
@@ -145,6 +109,5 @@
 				<type>jar</type>
 				<scope>compile</scope>
 		  </dependency>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 	</dependencies>
 </project>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-  <properties>
-      <root.dir>${basedir}/../../../..</root.dir>
-  </properties>
-
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
@@ -51,21 +47,8 @@
   		<version>0.2.18-SNAPSHOT</version>
   	</dependency>
   </dependencies>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -75,5 +58,4 @@
       </plugin>
     </plugins>
   </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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 @@
       <root.dir>${basedir}/../../../../..</root.dir>
   </properties>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-std</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-data-std</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>appassembler-maven-plugin</artifactId>
-                <version>1.3</version>
-                <executions>
-                    <execution>
-                        <id>sort</id>
-                        <configuration>
-                            <programs>
-                                <program>
-                                    <mainClass>org.apache.hyracks.examples.tpch.client.Sort</mainClass>
-                                    <name>sort</name>
-                                </program>
-                            </programs>
-                            <repositoryLayout>flat</repositoryLayout>
-                            <repositoryName>lib</repositoryName>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>assemble</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>group</id>
-                        <configuration>
-                            <programs>
-                                <program>
-                                    <mainClass>org.apache.hyracks.examples.tpch.client.Groupby</mainClass>
-                                    <name>group</name>
-                                </program>
-                            </programs>
-                            <repositoryLayout>flat</repositoryLayout>
-                            <repositoryName>lib</repositoryName>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>assemble</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>join</id>
-                        <configuration>
-                            <programs>
-                                <program>
-                                    <mainClass>org.apache.hyracks.examples.tpch.client.Join</mainClass>
-                                    <name>join</name>
-                                </program>
-                            </programs>
-                            <repositoryLayout>flat</repositoryLayout>
-                            <repositoryName>lib</repositoryName>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>assemble</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-=======
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
@@ -124,16 +47,6 @@
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
@@ -166,5 +79,4 @@
     </plugin>
     </plugins>
   </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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 @@
 		<groupId>org.apache.hyracks</groupId>
 		<version>0.2.18-SNAPSHOT</version>
 	</parent>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
 
-=======
-	<properties>
-			<root.dir>${basedir}/../../..</root.dir>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-					<fork>true</fork>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
 	<profiles>
 		<profile>
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 @@
 		<groupId>org.apache.hyracks</groupId>
 		<version>0.2.18-SNAPSHOT</version>
 	</parent>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
-	<properties>
-			<root.dir>${basedir}/../../..</root.dir>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-					<fork>true</fork>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
 	<profiles>
 		<profile>
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 @@
   </licenses>
 
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
-=======
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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.
  !-->
 <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">
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>hyracks-storage-am-btree</artifactId>
-    <name>hyracks-storage-am-btree</name>
-    <parent>
-        <groupId>org.apache.hyracks</groupId>
-        <artifactId>hyracks</artifactId>
-        <version>0.2.17-SNAPSHOT</version>
-    </parent>
-    <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>
-    <dependencies>
-=======
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hyracks-storage-am-btree</artifactId>
   <name>hyracks-storage-am-btree</name>
@@ -55,62 +36,35 @@
     </license>
   </licenses>
 
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <dependencies>
-  	<dependency>
-  		<groupId>org.apache.hyracks</groupId>
-  		<artifactId>hyracks-storage-common</artifactId>
-  		<version>0.2.18-SNAPSHOT</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>  	
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
+     <dependency>
+        <groupId>org.apache.hyracks</groupId>
+        <artifactId>hyracks-storage-common</artifactId>
+        <version>0.2.18-SNAPSHOT</version>
+        <type>jar</type>
+        <scope>compile</scope>
+     </dependency>
         <dependency>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-storage-common</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-storage-am-common</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-common</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-std</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
+        <groupId>org.apache.hyracks</groupId>
+        <artifactId>hyracks-storage-am-common</artifactId>
+        <version>0.2.18-SNAPSHOT</version>
+        <type>jar</type>
+        <scope>compile</scope>
+     </dependency>
+     <dependency>
+        <groupId>org.apache.hyracks</groupId>
+        <artifactId>hyracks-dataflow-common</artifactId>
+        <version>0.2.18-SNAPSHOT</version>
+        <type>jar</type>
+        <scope>compile</scope>
+     </dependency>
+     <dependency>
+        <groupId>org.apache.hyracks</groupId>
+        <artifactId>hyracks-dataflow-std</artifactId>
+        <version>0.2.18-SNAPSHOT</version>
+        <type>jar</type>
+        <scope>compile</scope>
+     </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
@@ -128,29 +82,5 @@
             <version>1.6.2</version>
             <scope>test</scope>
         </dependency>
-    </dependencies>
-</project>
-=======
-  		<groupId>org.apache.hyracks</groupId>
-  		<artifactId>hyracks-storage-am-common</artifactId>
-  		<version>0.2.18-SNAPSHOT</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>  	
-  	<dependency>
-  		<groupId>org.apache.hyracks</groupId>
-  		<artifactId>hyracks-dataflow-common</artifactId>
-  		<version>0.2.18-SNAPSHOT</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>  	
-  	<dependency>
-  		<groupId>org.apache.hyracks</groupId>
-  		<artifactId>hyracks-dataflow-std</artifactId>
-  		<version>0.2.18-SNAPSHOT</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>  	
   </dependencies>
 </project>
->>>>>>> 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 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <parent>
-        <artifactId>hyracks</artifactId>
-        <groupId>org.apache.hyracks</groupId>
-        <version>0.2.17-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-=======
 	<parent>
 		<artifactId>hyracks</artifactId>
 		<groupId>org.apache.hyracks</groupId>
 		<version>0.2.18-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <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>
-=======
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -60,44 +41,7 @@
   <properties>
       <root.dir>${basedir}/../..</root.dir>
   </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-util</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-storage-am-btree</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-storage-am-lsm-common</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-=======
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.hyracks</groupId>
@@ -114,5 +58,4 @@
 			<scope>compile</scope>
 	    </dependency>
 	</dependencies>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 </project>
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 @@
     </license>
   </licenses>
 
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
-
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
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 @@
     </license>
   </licenses>
 
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
 
   <dependencies>
   	<dependency>
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 @@
     </license>
   </licenses>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
-=======
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
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 @@
     </license>
   </licenses>
 
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -49,11 +38,6 @@
       </plugin>
     </plugins>
   </build>
-
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
   <dependencies>
   	<dependency>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-  <properties>
-      <root.dir>${basedir}/../..</root.dir>
-  </properties>
-
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
      <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-deploy-plugin</artifactId>
@@ -57,7 +40,6 @@
    </plugins>
 
   </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   	<dependency>
   		<groupId>org.apache.hyracks</groupId>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -49,11 +38,6 @@
       </plugin>
    </plugins>
   </build>
-
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
   <dependencies>  	
   	<dependency>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -49,11 +38,6 @@
       </plugin>
   </plugins>
  </build>
-
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
   <dependencies>  	
   	<dependency>
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 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hyracks-storage-am-lsm-invertedindex-test</artifactId>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <parent>
-        <artifactId>hyracks-tests</artifactId>
-        <groupId>org.apache.hyracks</groupId>
-        <version>0.2.17-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-=======
 	<parent>
 		<artifactId>hyracks-tests</artifactId>
 		<groupId>org.apache.hyracks</groupId>
 		<version>0.2.18-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-test-support</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-data-std</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-util</artifactId>
-            <version>0.2.17-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-=======
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
 			<plugin>
 				 <groupId>org.apache.maven.plugins</groupId>
 				 <artifactId>maven-deploy-plugin</artifactId>
@@ -90,9 +40,6 @@
 			</plugin>
 		</plugins>
 	</build>
-	<properties>
-			<root.dir>${basedir}/../../..</root.dir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.hyracks</groupId>
@@ -116,6 +63,5 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
 </project>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
       <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-deploy-plugin</artifactId>
@@ -49,11 +38,6 @@
     </plugin>
    </plugins>
   </build>
-
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
   <dependencies>  	
   	<dependency>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
       <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-deploy-plugin</artifactId>
@@ -51,11 +39,6 @@
     </plugin>
    </plugins>
   </build>
-
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
   <dependencies>
   	<dependency>
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 @@
     <version>0.2.18-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
-=======
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
       <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-deploy-plugin</artifactId>
@@ -51,11 +39,6 @@
     </plugin>
    </plugins>
   </build>
-
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
   <dependencies>
   	<dependency>
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 @@
     <parent>
         <artifactId>hyracks</artifactId>
         <groupId>org.apache.hyracks</groupId>
-        <version>0.2.17-SNAPSHOT</version>
+        <version>0.2.18-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -55,4 +55,4 @@
     </dependencies>
 
 
-</project>
\ No newline at end of file
+</project>
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 @@
     <version>0.2.1-SNAPSHOT</version>
   </parent>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
 
-=======
-  <properties>
-      <root.dir>${basedir}/../../..</root.dir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
   <dependencies>
   <dependency>
   	<groupId>org.apache.hadoop</groupId>
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.)
-<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>
-    <groupId>org.apache.hyracks</groupId>
-    <artifactId>fullstack</artifactId>
-    <version>0.2.17-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>hyracks-ecosystem-full-stack</name>
-=======
 <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>
   <groupId>org.apache.hyracks</groupId>
@@ -35,7 +25,6 @@
   <version>0.2.18-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>hyracks-ecosystem-full-stack</name>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
     <parent>
         <groupId>org.apache</groupId>
@@ -52,7 +41,6 @@
         </license>
     </licenses>
 
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdk.version>1.8</jdk.version>
@@ -112,66 +100,6 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-=======
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <root.dir>${basedir}</root.dir>
-    <jvm.extraargs />
-    <!-- Definition of tests in various categories which may be excluded -->
-    <hanging.pregelix.tests>**/pregelix/**/FailureRecovery*.java</hanging.pregelix.tests>
-    <hivesterix.perf.tests>**/hivesterix/perf/PerfTestSuite.java</hivesterix.perf.tests>
-    <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes>
-    <global.test.excludes>**/Abstract*.java,${hanging.pregelix.tests},${hivesterix.perf.tests}</global.test.excludes>
-    <!-- Versions under dependencymanagement or used in many projects via properties -->
-    <hadoop.version>2.2.0</hadoop.version>
-    <junit.version>4.8.1</junit.version>
-    <commons.io.version>2.4</commons.io.version>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-yarn-client</artifactId>
-            <version>${hadoop.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <version>${hadoop.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>${hadoop.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-hdfs</artifactId>
-            <version>${hadoop.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
-            <version>${hadoop.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-mapreduce-client-core</artifactId>
-            <version>${hadoop.version}</version>
-          </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
-        </dependency>
-    </dependencies>
-  </dependencyManagement>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
 
   <build>
     <plugins>
@@ -186,7 +114,7 @@
         <version>0.11</version>
         <executions>
             <execution>
-                <phase>validate</phase>
+                <phase>test</phase>
                 <goals>
                     <goal>check</goal>
                 </goals>
@@ -217,7 +145,6 @@
           </licenseFamilies>
           <excludeSubProjects>false</excludeSubProjects>
           <excludes>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
            <exclude>**/algebricks-tests/src/test/resources/results/**</exclude>
            <exclude>**/javascript/flot/*.js</exclude>
            <exclude>**/javascript/jsplumb/*.js</exclude>
@@ -244,15 +171,13 @@
            <exclude>**/ClusterControllerService/**</exclude>
            <exclude>**/target/**</exclude>
            <exclude>**/output/**</exclude>
-=======
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
            <exclude>**/target/**</exclude>
            <exclude>**/*.iml</exclude>
-<<<<<<< HEAD   (756ba7 ASTERIXDB-1322: fix variable visitors for SubplanOperator.)
            <exclude>**/*.prefs</exclude>
            <exclude>**/.classpath</exclude>
            <exclude>**/.project</exclude>
-=======
+           <exclude>**/target/**</exclude>
+           <exclude>**/*.iml</exclude>
            <exclude>**/.classpath</exclude>
            <exclude>**/.project</exclude>
            <exclude>**/.settings/**</exclude>
@@ -281,7 +206,6 @@
            <exclude>hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/expected/part-0</exclude>
            <exclude>hyracks/hyracks-storage-am-common/src/main/resources/dist.all.first.cleaned</exclude>
            <exclude>hyracks/hyracks-storage-am-common/src/main/resources/dist.all.last.cleaned</exclude>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development iteratio)
       </excludes>
         </configuration>
       </plugin>

-- 
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 <imaxon@apache.org>

Mime
View raw message