Ian Maxon has submitted this change and it was merged.
Change subject: Merge branch 'release-0.2.17' into master
......................................................................
Merge branch 'release-0.2.17' into 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/piglet-example/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-common/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
41 files changed, 72 insertions(+), 1,075 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Verified
diff --git a/algebricks/algebricks-compiler/pom.xml
b/algebricks/algebricks-compiler/pom.xml
index 969524c..849ae7a 100644
--- a/algebricks/algebricks-compiler/pom.xml
+++ b/algebricks/algebricks-compiler/pom.xml
@@ -37,27 +37,10 @@
</license>
</licenses>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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 fd0b29e..c56f6c3 100644
--- a/algebricks/algebricks-core/pom.xml
+++ b/algebricks/algebricks-core/pom.xml
@@ -37,27 +37,10 @@
</license>
</licenses>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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 7572cc6..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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
-/*
- * 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 ac89909..a7ea706 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
@@ -298,7 +298,6 @@
@Override
public String visitOuterUnnestOperator(OuterUnnestOperator op, Integer
indent) throws AlgebricksException {
StringBuilder buffer = new StringBuilder();
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
addIndent(buffer, indent).append("outer-unnest " + op.getVariable());
if (op.getPositionalVariable() != null) {
buffer.append(" at " + op.getPositionalVariable());
@@ -322,9 +321,6 @@
throws AlgebricksException {
StringBuilder buffer = new StringBuilder();
addIndent(buffer, indent).append(opSignature + " " + op.getVariables()
+ " <- "
-=======
- addIndent(buffer, indent).append("unnest-map " + op.getVariables() + "
<- "
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development
iteratio)
+ op.getExpressionRef().getValue().accept(exprVisitor,
indent));
return buffer.toString();
}
@@ -381,7 +377,6 @@
public String visitInsertDeleteUpsertOperator(InsertDeleteUpsertOperator
op, Integer indent)
throws AlgebricksException {
StringBuilder buffer = new StringBuilder();
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
String header = getIndexOpString(op.getOperation());
addIndent(buffer,
indent).append(header).append(op.getDataSource()).append(" from ")
.append(op.getPayloadExpression().getValue().accept(exprVisitor, indent));
@@ -389,23 +384,9 @@
pprintExprList(op.getAdditionalNonFilteringExpressions(), buffer,
indent);
}
buffer.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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
if (op.getOperation() == Kind.UPSERT) {
buffer.append(" out: ([record-before-upsert:" +
op.getPrevRecordVar() + "]) ");
-=======
- 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]");
@@ -417,7 +398,6 @@
public String
visitIndexInsertDeleteUpsertOperator(IndexInsertDeleteUpsertOperator op,
Integer indent)
throws AlgebricksException {
StringBuilder buffer = new StringBuilder();
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
String header = getIndexOpString(op.getOperation());
addIndent(buffer,
indent).append(header).append(op.getIndexName()).append(" on ")
.append(op.getDataSourceIndex().getDataSource()).append(" from
");
@@ -428,19 +408,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]");
@@ -543,17 +510,4 @@
}
sb.append("]");
}
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
-
- @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 150423c..2f08ec9 100644
--- a/algebricks/algebricks-data/pom.xml
+++ b/algebricks/algebricks-data/pom.xml
@@ -37,27 +37,10 @@
</license>
</licenses>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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/piglet-example/pom.xml
b/algebricks/algebricks-examples/piglet-example/pom.xml
index 7ae3360..d87c17e 100644
--- a/algebricks/algebricks-examples/piglet-example/pom.xml
+++ b/algebricks/algebricks-examples/piglet-example/pom.xml
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-util</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/algebricks/algebricks-examples/pom.xml
b/algebricks/algebricks-examples/pom.xml
index 1ad6582..5a1cd27 100644
--- a/algebricks/algebricks-examples/pom.xml
+++ b/algebricks/algebricks-examples/pom.xml
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-core</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/hyracks/hyracks-api/pom.xml b/hyracks/hyracks-api/pom.xml
index 6e95999..6b8c56b 100644
--- a/hyracks/hyracks-api/pom.xml
+++ b/hyracks/hyracks-api/pom.xml
@@ -40,7 +40,6 @@
<root.dir>${basedir}/../..</root.dir>
</properties>
-
<dependencies>
<dependency>
<groupId>org.json</groupId>
diff --git a/hyracks/hyracks-comm/pom.xml b/hyracks/hyracks-comm/pom.xml
index 0cff357..0626ebd 100644
--- a/hyracks/hyracks-comm/pom.xml
+++ b/hyracks/hyracks-comm/pom.xml
@@ -40,7 +40,6 @@
<root.dir>${basedir}/../..</root.dir>
</properties>
-
<dependencies>
<dependency>
<groupId>org.apache.hyracks</groupId>
diff --git a/hyracks/hyracks-control/hyracks-control-cc/pom.xml
b/hyracks/hyracks-control/hyracks-control-cc/pom.xml
index db9e82f..d767560 100644
--- a/hyracks/hyracks-control/hyracks-control-cc/pom.xml
+++ b/hyracks/hyracks-control/hyracks-control-cc/pom.xml
@@ -27,27 +27,9 @@
<version>0.2.18-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
- <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 d5fd938..a6b25dc 100644
--- a/hyracks/hyracks-control/hyracks-control-common/pom.xml
+++ b/hyracks/hyracks-control/hyracks-control-common/pom.xml
@@ -27,27 +27,9 @@
<version>0.2.18-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
- <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 705f2aa..e59262f 100644
--- a/hyracks/hyracks-control/hyracks-control-nc/pom.xml
+++ b/hyracks/hyracks-control/hyracks-control-nc/pom.xml
@@ -27,27 +27,9 @@
<version>0.2.18-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
- <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 95999af..ddd77c8 100644
--- a/hyracks/hyracks-data/hyracks-data-std/pom.xml
+++ b/hyracks/hyracks-data/hyracks-data-std/pom.xml
@@ -23,64 +23,31 @@
<artifactId>hyracks-data-std</artifactId>
<name>hyracks-data-std</name>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
<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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
+ <properties>
+ <root.dir>${basedir}/../../..</root.dir>
+ </properties>
<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 35601c0..859d5bc 100644
--- a/hyracks/hyracks-dataflow-common/pom.xml
+++ b/hyracks/hyracks-dataflow-common/pom.xml
@@ -17,18 +17,6 @@
! under the License.
!-->
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-<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.17-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>
@@ -38,9 +26,7 @@
<artifactId>hyracks</artifactId>
<version>0.2.18-SNAPSHOT</version>
</parent>
->>>>>>> BRANCH (14be94 [maven-release-plugin] prepare for next development
iteratio)
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -49,52 +35,40 @@
<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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
+ <properties>
+ <root.dir>${basedir}/../..</root.dir>
+ </properties>
<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 +76,5 @@
<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 4178310..e7e511e 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
- <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,19 +42,18 @@
<root.dir>${basedir}/../..</root.dir>
</properties>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
<dependencies>
<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-dataflow-common</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -73,50 +64,8 @@
<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>
</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-dataflow-common</artifactId>
- <version>0.2.18-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.18-SNAPSHOT</version>
- <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 cc5a725..ae1d946 100644
--- a/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml
+++ b/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml
@@ -58,21 +58,9 @@
<version>0.2.18-SNAPSHOT</version>
</dependency>
</dependencies>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -82,5 +70,4 @@
</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 dc7f901..c425c52 100644
--- a/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
+++ b/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
@@ -27,20 +27,9 @@
<artifactId>hyracks-examples</artifactId>
<version>0.2.18-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -53,7 +42,6 @@
<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,11 +111,10 @@
<artifactId>hyracks-data-std</artifactId>
<version>0.2.18-SNAPSHOT</version>
</dependency>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-client</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -137,14 +124,5 @@
<version>1.2.2</version>
<scope>test</scope>
</dependency>
-=======
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-client</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- <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 fba20de..a3cab26 100644
--- a/hyracks/hyracks-examples/text-example/texthelper/pom.xml
+++ b/hyracks/hyracks-examples/text-example/texthelper/pom.xml
@@ -51,21 +51,8 @@
<version>0.2.18-SNAPSHOT</version>
</dependency>
</dependencies>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
<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 +62,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 d21fd75..7dbcf24 100644
--- a/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
+++ b/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
@@ -27,23 +27,20 @@
<version>0.2.18-SNAPSHOT</version>
</parent>
-
- <properties>
- <root.dir>${basedir}/../../../../..</root.dir>
- </properties>
-
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
+ <properties>
+ <root.dir>${basedir}/../../../../..</root.dir>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-dataflow-std</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-SNAPSHOT</version>
<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>
</dependencies>
<build>
@@ -106,65 +103,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
-=======
- <dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-data-std</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </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>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <configuration>
- <programs>
- <program>
-
<mainClass>org.apache.hyracks.examples.tpch.client.Sort</mainClass>
- <name>tpchclient</name>
- </program>
- </programs>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </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-hdfs/hyracks-hdfs-1.x/pom.xml
b/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml
index a497e6a..4804393 100644
--- a/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml
+++ b/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml
@@ -26,28 +26,9 @@
<groupId>org.apache.hyracks</groupId>
<version>0.2.18-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-
-=======
<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 5a5fced..9d93aac 100644
--- a/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml
+++ b/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml
@@ -26,26 +26,9 @@
<groupId>org.apache.hyracks</groupId>
<version>0.2.18-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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 e1530ff..7472c9d 100644
--- a/hyracks/hyracks-ipc/pom.xml
+++ b/hyracks/hyracks-ipc/pom.xml
@@ -37,27 +37,10 @@
</licenses>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
- <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 988488c..8436412 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,8 @@
<version>0.2.18-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
<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 5e53cf6..f11fe67 100644
--- a/hyracks/hyracks-storage-am-btree/pom.xml
+++ b/hyracks/hyracks-storage-am-btree/pom.xml
@@ -17,14 +17,13 @@
! 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
<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>
+ <version>0.2.18-SNAPSHOT</version>
</parent>
<licenses>
<license>
@@ -34,80 +33,35 @@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
+ <properties>
+ <root.dir>${basedir}/../..</root.dir>
+ </properties>
<dependencies>
-=======
- <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.18-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>
-
- <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>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-storage-common</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-storage-am-common</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-dataflow-common</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-dataflow-std</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -130,27 +84,3 @@
</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-common/pom.xml
b/hyracks/hyracks-storage-am-common/pom.xml
index 7d41d46..2f4d0e9 100644
--- a/hyracks/hyracks-storage-am-common/pom.xml
+++ b/hyracks/hyracks-storage-am-common/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-util</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
b/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
index bcc83c6..0595533 100644
--- a/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
+++ b/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
@@ -22,23 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
- <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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -47,72 +37,30 @@
<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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
<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-storage-am-btree</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-storage-am-lsm-common</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-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>
- <artifactId>hyracks-storage-am-btree</artifactId>
- <version>0.2.18-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.18-SNAPSHOT</version>
- <type>jar</type>
- <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..c632a8c 100644
--- a/hyracks/hyracks-storage-am-lsm-rtree/pom.xml
+++ b/hyracks/hyracks-storage-am-lsm-rtree/pom.xml
@@ -40,7 +40,6 @@
<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..8356f7a 100644
--- a/hyracks/hyracks-storage-am-rtree/pom.xml
+++ b/hyracks/hyracks-storage-am-rtree/pom.xml
@@ -41,7 +41,6 @@
<root.dir>${basedir}/../..</root.dir>
</properties>
-
<dependencies>
<dependency>
<groupId>org.apache.hyracks</groupId>
diff --git a/hyracks/hyracks-storage-common/pom.xml
b/hyracks/hyracks-storage-common/pom.xml
index b2fb766..bffa6e2 100644
--- a/hyracks/hyracks-storage-common/pom.xml
+++ b/hyracks/hyracks-storage-common/pom.xml
@@ -37,27 +37,9 @@
</license>
</licenses>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
- <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..ef6f58c 100644
--- a/hyracks/hyracks-test-support/pom.xml
+++ b/hyracks/hyracks-test-support/pom.xml
@@ -40,7 +40,6 @@
<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 1739078..4273f3a 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -53,7 +42,6 @@
<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 d227e47..ef4ffb1 100644
--- a/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml
+++ b/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml
@@ -32,21 +32,8 @@
<root.dir>${basedir}/../..</root.dir>
</properties>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
<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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
@@ -55,9 +42,8 @@
</configuration>
</plugin>
</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 abf91a9..5fa81dd 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -53,7 +42,6 @@
<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 d6fb18b..131e20e 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -53,7 +42,6 @@
<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 303d76a..8972b97 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,100 +22,57 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>hyracks-storage-am-lsm-invertedindex-test</artifactId>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
<parent>
<artifactId>hyracks-tests</artifactId>
<groupId>org.apache.hyracks</groupId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
+ <build>
+ <plugins>
+ <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>
+
<dependencies>
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-storage-am-lsm-invertedindex</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-test-support</artifactId>
- <version>0.2.17-SNAPSHOT</version>
+ <version>0.2.18-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>
+ <version>0.2.18-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>
+ <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>
- </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>
- <dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
-
<artifactId>hyracks-storage-am-lsm-invertedindex</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-test-support</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-data-std</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- <type>jar</type>
- <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 c3ec512..2a16328 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -53,7 +42,6 @@
<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 72f1089..28e5fb4 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -55,7 +43,6 @@
<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 bcb2f30..7457572 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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
-=======
<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>
@@ -55,7 +43,6 @@
<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 4a011e1..e0081cc 100644
--- a/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
+++ b/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml
@@ -26,27 +26,10 @@
<version>0.2.1-SNAPSHOT</version>
</parent>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-
-=======
<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 1a32062..4443b51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,16 +18,6 @@
!-->
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
-<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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
<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>
@@ -217,7 +145,6 @@
</licenseFamilies>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
-<<<<<<< HEAD (8f8136 ASTERIXDB-865: fix for if-else expression.)
<exclude>**/algebricks-tests/src/test/resources/results/**</exclude>
<exclude>**/javascript/flot/*.js</exclude>
<exclude>**/javascript/jsplumb/*.js</exclude>
@@ -243,17 +170,15 @@
<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 (8f8136 ASTERIXDB-865: fix for if-else expression.)
<exclude>**/*.prefs</exclude>
<exclude>**/data/*.txt</exclude>
<exclude>**/data/**/*.txt</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
-=======
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.iml</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
<exclude>**/.settings/**</exclude>
@@ -282,7 +207,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>
@@ -380,10 +304,6 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
</plugin>
</plugins>
</build>
--
To view, visit https://asterix-gerrit.ics.uci.edu/675
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769147
Gerrit-PatchSet: 6
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <[email protected]>
Gerrit-Reviewer: Chris Hillery <[email protected]>
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Till Westmann <[email protected]>
Gerrit-Reviewer: abdullah alamoudi <[email protected]>
