Michael Blow has submitted this change and it was merged.
Change subject: Merge commit '23d990ca' from 'stabilization-f69489' to 'master'
......................................................................
Merge commit '23d990ca' from 'stabilization-f69489' to 'master'
Change-Id: I9a359fc5ac3f3cd50c7a4ed8b4de5d17d5900ceb
---
M asterixdb/asterix-active/pom.xml
M asterixdb/asterix-algebra/pom.xml
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-benchmark/pom.xml
M asterixdb/asterix-client-helper/pom.xml
M asterixdb/asterix-common/pom.xml
M asterixdb/asterix-coverage/pom.xml
M asterixdb/asterix-dashboard/pom.xml
M asterixdb/asterix-doc/pom.xml
M asterixdb/asterix-docker/pom.xml
M asterixdb/asterix-examples/pom.xml
M asterixdb/asterix-external-data/pom.xml
M asterixdb/asterix-fuzzyjoin/pom.xml
M asterixdb/asterix-geo/pom.xml
M asterixdb/asterix-hivecompat/pom.xml
M asterixdb/asterix-lang-aql/pom.xml
M asterixdb/asterix-lang-common/pom.xml
M asterixdb/asterix-lang-sqlpp/pom.xml
M asterixdb/asterix-license/pom.xml
M
asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml
M asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml
M
asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml
M asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
M asterixdb/asterix-maven-plugins/pom.xml
M asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
M asterixdb/asterix-metadata/pom.xml
M asterixdb/asterix-om/pom.xml
M asterixdb/asterix-replication/pom.xml
M asterixdb/asterix-runtime/pom.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/asterix-test-framework/pom.xml
M asterixdb/asterix-tools/pom.xml
M asterixdb/asterix-transactions/pom.xml
M asterixdb/pom.xml
M hyracks-fullstack/algebricks/algebricks-common/pom.xml
M hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
M hyracks-fullstack/algebricks/algebricks-core/pom.xml
M hyracks-fullstack/algebricks/algebricks-data/pom.xml
M hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
M hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
M hyracks-fullstack/algebricks/algebricks-tests/pom.xml
M hyracks-fullstack/algebricks/pom.xml
M hyracks-fullstack/hyracks-fullstack-license/pom.xml
M hyracks-fullstack/hyracks/hyracks-api/pom.xml
M hyracks-fullstack/hyracks/hyracks-client/pom.xml
M hyracks-fullstack/hyracks/hyracks-comm/pom.xml
M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml
M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml
M hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
M hyracks-fullstack/hyracks/hyracks-control/pom.xml
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml
M hyracks-fullstack/hyracks/hyracks-data/pom.xml
M hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
M hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
M hyracks-fullstack/hyracks/hyracks-dist/pom.xml
M hyracks-fullstack/hyracks/hyracks-documentation/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/btree-example/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/text-example/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/tpch-example/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
M hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
M hyracks-fullstack/hyracks/hyracks-http/pom.xml
M hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
M
hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
M
hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
M hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml
M hyracks-fullstack/hyracks/hyracks-net/pom.xml
M hyracks-fullstack/hyracks/hyracks-server/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
M hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml
M
hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml
M hyracks-fullstack/hyracks/hyracks-tests/pom.xml
M hyracks-fullstack/hyracks/hyracks-util/pom.xml
M hyracks-fullstack/hyracks/pom.xml
M hyracks-fullstack/pom.xml
M pom.xml
102 files changed, 11 insertions(+), 424 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/asterix-active/pom.xml b/asterixdb/asterix-active/pom.xml
index 70741d8..9b5dcbf 100644
--- a/asterixdb/asterix-active/pom.xml
+++ b/asterixdb/asterix-active/pom.xml
@@ -21,11 +21,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-active</artifactId>
<properties>
diff --git a/asterixdb/asterix-algebra/pom.xml
b/asterixdb/asterix-algebra/pom.xml
index 1a432ed..ee0bb5e 100644
--- a/asterixdb/asterix-algebra/pom.xml
+++ b/asterixdb/asterix-algebra/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-algebra</artifactId>
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 4dd4442..c919856 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-app</artifactId>
<licenses>
diff --git a/asterixdb/asterix-benchmark/pom.xml
b/asterixdb/asterix-benchmark/pom.xml
index 45ffcf8..c22c243 100644
--- a/asterixdb/asterix-benchmark/pom.xml
+++ b/asterixdb/asterix-benchmark/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-benchmark</artifactId>
diff --git a/asterixdb/asterix-client-helper/pom.xml
b/asterixdb/asterix-client-helper/pom.xml
index b00e2f6..92cf967 100644
--- a/asterixdb/asterix-client-helper/pom.xml
+++ b/asterixdb/asterix-client-helper/pom.xml
@@ -22,11 +22,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
<root.dir>${basedir}/..</root.dir>
diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml
index 765fe75..760e027 100644
--- a/asterixdb/asterix-common/pom.xml
+++ b/asterixdb/asterix-common/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-common</artifactId>
<licenses>
diff --git a/asterixdb/asterix-coverage/pom.xml
b/asterixdb/asterix-coverage/pom.xml
index fbbc95f..ba34646 100644
--- a/asterixdb/asterix-coverage/pom.xml
+++ b/asterixdb/asterix-coverage/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git a/asterixdb/asterix-dashboard/pom.xml
b/asterixdb/asterix-dashboard/pom.xml
index 251adb2..acf7e13 100644
--- a/asterixdb/asterix-dashboard/pom.xml
+++ b/asterixdb/asterix-dashboard/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>asterix-dashboard</artifactId>
diff --git a/asterixdb/asterix-doc/pom.xml b/asterixdb/asterix-doc/pom.xml
index 16b2409..b6f77a5 100644
--- a/asterixdb/asterix-doc/pom.xml
+++ b/asterixdb/asterix-doc/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<url>http://asterixdb.apache.org/</url>
diff --git a/asterixdb/asterix-docker/pom.xml b/asterixdb/asterix-docker/pom.xml
index f2b88eb..0220837 100644
--- a/asterixdb/asterix-docker/pom.xml
+++ b/asterixdb/asterix-docker/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-docker</artifactId>
diff --git a/asterixdb/asterix-examples/pom.xml
b/asterixdb/asterix-examples/pom.xml
index 15d159a..e50c1e9 100644
--- a/asterixdb/asterix-examples/pom.xml
+++ b/asterixdb/asterix-examples/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-examples</artifactId>
diff --git a/asterixdb/asterix-external-data/pom.xml
b/asterixdb/asterix-external-data/pom.xml
index f90821b..eacb2b7 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
diff --git a/asterixdb/asterix-fuzzyjoin/pom.xml
b/asterixdb/asterix-fuzzyjoin/pom.xml
index 5733de3..5c31882 100644
--- a/asterixdb/asterix-fuzzyjoin/pom.xml
+++ b/asterixdb/asterix-fuzzyjoin/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-fuzzyjoin</artifactId>
diff --git a/asterixdb/asterix-geo/pom.xml b/asterixdb/asterix-geo/pom.xml
index 9fc62c6..81d7871 100644
--- a/asterixdb/asterix-geo/pom.xml
+++ b/asterixdb/asterix-geo/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-geo</artifactId>
diff --git a/asterixdb/asterix-hivecompat/pom.xml
b/asterixdb/asterix-hivecompat/pom.xml
index 4dbb982..bd5df93 100644
--- a/asterixdb/asterix-hivecompat/pom.xml
+++ b/asterixdb/asterix-hivecompat/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
diff --git a/asterixdb/asterix-lang-aql/pom.xml
b/asterixdb/asterix-lang-aql/pom.xml
index 05bee00..f202192 100644
--- a/asterixdb/asterix-lang-aql/pom.xml
+++ b/asterixdb/asterix-lang-aql/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/asterixdb/asterix-lang-common/pom.xml
b/asterixdb/asterix-lang-common/pom.xml
index ef67a9d..bb153a5 100644
--- a/asterixdb/asterix-lang-common/pom.xml
+++ b/asterixdb/asterix-lang-common/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/asterixdb/asterix-lang-sqlpp/pom.xml
b/asterixdb/asterix-lang-sqlpp/pom.xml
index 65405b6..f13c219 100644
--- a/asterixdb/asterix-lang-sqlpp/pom.xml
+++ b/asterixdb/asterix-lang-sqlpp/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
diff --git a/asterixdb/asterix-license/pom.xml
b/asterixdb/asterix-license/pom.xml
index 55fe87a..166039a 100644
--- a/asterixdb/asterix-license/pom.xml
+++ b/asterixdb/asterix-license/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git
a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml
b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml
index 49dacc0..d5ad95c 100644
---
a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml
+++
b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml
@@ -22,11 +22,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-maven-plugins</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<packaging>maven-plugin</packaging>
diff --git
a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml
b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml
index 8d74a32..fb78a92 100644
---
a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml
+++
b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml
@@ -21,11 +21,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-maven-plugins</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-grammar-extension-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
@@ -169,4 +165,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
diff --git
a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml
b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml
index abbf6e1..60a689f 100644
---
a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml
+++
b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml
@@ -26,11 +26,7 @@
<parent>
<artifactId>asterix-maven-plugins</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
index 6d3b49b..31e9632 100644
--- a/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
+++ b/asterixdb/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>asterix-maven-plugins</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<packaging>maven-plugin</packaging>
diff --git a/asterixdb/asterix-maven-plugins/pom.xml
b/asterixdb/asterix-maven-plugins/pom.xml
index 6cd2a9d..6f8558e 100644
--- a/asterixdb/asterix-maven-plugins/pom.xml
+++ b/asterixdb/asterix-maven-plugins/pom.xml
@@ -25,11 +25,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git
a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
index 6f5a343..50d6a80 100644
---
a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
+++
b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>asterix-maven-plugins</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<packaging>maven-plugin</packaging>
diff --git a/asterixdb/asterix-metadata/pom.xml
b/asterixdb/asterix-metadata/pom.xml
index 6a2f4d0..d14d8d5 100644
--- a/asterixdb/asterix-metadata/pom.xml
+++ b/asterixdb/asterix-metadata/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-metadata</artifactId>
<properties>
diff --git a/asterixdb/asterix-om/pom.xml b/asterixdb/asterix-om/pom.xml
index 50c04ba..b2beb41 100644
--- a/asterixdb/asterix-om/pom.xml
+++ b/asterixdb/asterix-om/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-om</artifactId>
diff --git a/asterixdb/asterix-replication/pom.xml
b/asterixdb/asterix-replication/pom.xml
index b4bdc1f..552f3f1 100644
--- a/asterixdb/asterix-replication/pom.xml
+++ b/asterixdb/asterix-replication/pom.xml
@@ -3,11 +3,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-replication</artifactId>
<licenses>
diff --git a/asterixdb/asterix-runtime/pom.xml
b/asterixdb/asterix-runtime/pom.xml
index ceb33eb..c7e7071 100644
--- a/asterixdb/asterix-runtime/pom.xml
+++ b/asterixdb/asterix-runtime/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-runtime</artifactId>
<properties>
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index dc2032f..38bcbe0 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/asterixdb/asterix-test-framework/pom.xml
b/asterixdb/asterix-test-framework/pom.xml
index 5e9a043..f7fce4c 100644
--- a/asterixdb/asterix-test-framework/pom.xml
+++ b/asterixdb/asterix-test-framework/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-test-framework</artifactId>
diff --git a/asterixdb/asterix-tools/pom.xml b/asterixdb/asterix-tools/pom.xml
index f2fa68b..9e41ef6 100644
--- a/asterixdb/asterix-tools/pom.xml
+++ b/asterixdb/asterix-tools/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-tools</artifactId>
diff --git a/asterixdb/asterix-transactions/pom.xml
b/asterixdb/asterix-transactions/pom.xml
index e154e07..5b84162 100644
--- a/asterixdb/asterix-transactions/pom.xml
+++ b/asterixdb/asterix-transactions/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>asterix-transactions</artifactId>
<licenses>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 27804df..0e6e80d 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -21,11 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
<packaging>pom</packaging>
<url>${implementation.url}</url>
@@ -79,13 +75,8 @@
<itest.excludes>${global.itest.excludes}</itest.excludes>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
-=======
- <algebricks.version>0.3.4.2-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.4.2-SNAPSHOT</hyracks.version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
diff --git a/hyracks-fullstack/algebricks/algebricks-common/pom.xml
b/hyracks-fullstack/algebricks/algebricks-common/pom.xml
index 2e8e9fc..53258d0 100644
--- a/hyracks-fullstack/algebricks/algebricks-common/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-common/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
index 4656f90..ff92d91 100644
--- a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/algebricks/algebricks-core/pom.xml
b/hyracks-fullstack/algebricks/algebricks-core/pom.xml
index 5ae7652..55aa465 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-core/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/algebricks/algebricks-data/pom.xml
b/hyracks-fullstack/algebricks/algebricks-data/pom.xml
index 5601fe6..5f61160 100644
--- a/hyracks-fullstack/algebricks/algebricks-data/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-data/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
index daea743..af48b78 100644
--- a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
@@ -75,4 +71,4 @@
<artifactId>log4j-api</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
b/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
index 6de9301..c8f7cbf 100644
--- a/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
index 1c95020..3800f62 100644
--- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/algebricks/pom.xml
b/hyracks-fullstack/algebricks/pom.xml
index e7543c4..abb7ea3 100644
--- a/hyracks-fullstack/algebricks/pom.xml
+++ b/hyracks-fullstack/algebricks/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>apache-hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks-fullstack-license/pom.xml
b/hyracks-fullstack/hyracks-fullstack-license/pom.xml
index 700e939..79357b0 100644
--- a/hyracks-fullstack/hyracks-fullstack-license/pom.xml
+++ b/hyracks-fullstack/hyracks-fullstack-license/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>apache-hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml
b/hyracks-fullstack/hyracks/hyracks-api/pom.xml
index a6740d6..90fb5ed 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-client/pom.xml
b/hyracks-fullstack/hyracks/hyracks-client/pom.xml
index 6fb81d3..1855589 100644
--- a/hyracks-fullstack/hyracks/hyracks-client/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-client/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-comm/pom.xml
b/hyracks-fullstack/hyracks/hyracks-comm/pom.xml
index 4d39d8f..ab1e214 100644
--- a/hyracks-fullstack/hyracks/hyracks-comm/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-comm/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
index fe0fcf1..dc1b3a8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml
index e3de73f..99530c5 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml
index 0011329..3ddb752 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
index b105c29..0ac758f 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
@@ -21,11 +21,7 @@
<parent>
<artifactId>hyracks-control</artifactId>
<groupId>org.apache.hyracks</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/hyracks-fullstack/hyracks/hyracks-control/pom.xml
b/hyracks-fullstack/hyracks/hyracks-control/pom.xml
index c63b9d2..9b2242e 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml
b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml
index 8ef5174..c27d884 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-data</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
<root.dir>${basedir}/../../..</root.dir>
diff --git a/hyracks-fullstack/hyracks/hyracks-data/pom.xml
b/hyracks-fullstack/hyracks/hyracks-data/pom.xml
index 316410d..ef7a30e 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-data/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
index ab52e48..9c57119 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
index fda3655..abaf146 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-dist/pom.xml
b/hyracks-fullstack/hyracks/hyracks-dist/pom.xml
index 8106835..735e717 100644
--- a/hyracks-fullstack/hyracks/hyracks-dist/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dist/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>hyracks</artifactId>
<groupId>org.apache.hyracks</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-documentation/pom.xml
b/hyracks-fullstack/hyracks/hyracks-documentation/pom.xml
index 6868e79..b63bf66 100644
--- a/hyracks-fullstack/hyracks/hyracks-documentation/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-documentation/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
index cacbb4f..69a80c7 100644
---
a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks.examples</groupId>
<artifactId>btree-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml
index 4488cdc..a9221a6 100644
---
a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks.examples</groupId>
<artifactId>btree-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
index 99f220d..ccfdb45 100644
---
a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks.examples</groupId>
<artifactId>btree-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/pom.xml
index d20a473..2c15ad3 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/pom.xml
@@ -27,11 +27,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-examples</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
index 16b5c5e..100c93a 100644
---
a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-examples</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
index 2c5b65e..5782726 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-examples</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/pom.xml
index 0b7bea2..3dbe410 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/text-example/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/text-example/pom.xml
index 9f36bdc..7f43536 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-examples</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
index 519c5f9..c00ffc1 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>text-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml
index 51545c9..eb902fe 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>text-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
index 08697b6..150f618 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>text-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/pom.xml
index 754feb8..e126f4f 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-examples</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
index d6b205d..31bcf2e 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>tpch-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
index 92eb222..b0b908e 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>tpch-example</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index baaf0d4..7e00d82 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git a/hyracks-fullstack/hyracks/hyracks-http/pom.xml
b/hyracks-fullstack/hyracks/hyracks-http/pom.xml
index c83c28d..bf96e79 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-http/pom.xml
@@ -22,11 +22,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<artifactId>hyracks-http</artifactId>
<properties>
@@ -110,4 +106,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
b/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
index c752e8f..4db3418 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
index 95effc2..f6a7088 100644
---
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-maven-plugins</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
index 21789a0..cce85ef 100644
---
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
@@ -21,11 +21,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-maven-plugins</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>maven-plugin</packaging>
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml
index 46bc21d..3d2edaf 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-net/pom.xml
b/hyracks-fullstack/hyracks/hyracks-net/pom.xml
index 6d68c17..824098c 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml
b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
index 1b938f1..7e566d6 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml
index 95e8a06..992680f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
index 0b260a1..fa74184 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
@@ -112,4 +108,4 @@
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
index 5b41cad..262570a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
@@ -119,4 +115,4 @@
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml
index ad215ee..a949d28 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
@@ -96,4 +92,4 @@
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
index 8b67e1f..27cc53e 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
@@ -99,4 +95,4 @@
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
index 4cafd89..91baa74 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml
@@ -23,11 +23,7 @@
<parent>
<artifactId>hyracks</artifactId>
<groupId>org.apache.hyracks</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
<relativePath>..</relativePath>
</parent>
<licenses>
@@ -101,4 +97,4 @@
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml
index 2a6574b..5374f6d 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
@@ -100,4 +96,4 @@
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml
index f9a9a7d..68f9511 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
index d2b1a4f..423925b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
<license>
@@ -76,4 +72,4 @@
<version>1.1.7.1</version>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
index bab7ede..7d2d2ae 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml
index 0c76e9d..d233bce 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml
index a5bc78e..a3602a2 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<properties>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml
index 20a2a6d..ced7f1e 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml
index 4a2146b..c38ba3c 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml
index 0bc2607..8b8f287 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml
@@ -24,11 +24,7 @@
<parent>
<artifactId>hyracks-tests</artifactId>
<groupId>org.apache.hyracks</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
<relativePath>..</relativePath>
</parent>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml
index 682fa28..0466b17 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml
@@ -24,11 +24,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml
index 4780160..5f6ff18 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml
@@ -25,11 +25,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
diff --git
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml
index 64d737e..756734c 100644
---
a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml
@@ -23,11 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-tests</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
<plugins>
@@ -81,4 +77,4 @@
<artifactId>log4j-api</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/pom.xml
b/hyracks-fullstack/hyracks/hyracks-tests/pom.xml
index 6ea9cfd..02f050b 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-tests/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<licenses>
diff --git a/hyracks-fullstack/hyracks/hyracks-util/pom.xml
b/hyracks-fullstack/hyracks/hyracks-util/pom.xml
index b7a5a1e..e2da20a 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-util/pom.xml
@@ -22,11 +22,7 @@
<parent>
<artifactId>hyracks</artifactId>
<groupId>org.apache.hyracks</groupId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/hyracks-fullstack/hyracks/pom.xml
b/hyracks-fullstack/hyracks/pom.xml
index 9af31c6..5990526 100644
--- a/hyracks-fullstack/hyracks/pom.xml
+++ b/hyracks-fullstack/hyracks/pom.xml
@@ -26,11 +26,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>apache-hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
</parent>
<build>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 0198f0d..565d29b 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -21,11 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hyracks</groupId>
<artifactId>apache-hyracks</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.3.5-SNAPSHOT</version>
-=======
- <version>0.3.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
<packaging>pom</packaging>
<name>hyracks-ecosystem-full-stack</name>
<url>${implementation.url}</url>
diff --git a/pom.xml b/pom.xml
index dab8718..7c579b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,11 +19,7 @@
<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>apache-asterixdb-fullstack</artifactId>
-<<<<<<< HEAD (ac6c18 Merge commit '963a544' from 'stabilization-f69489' to
'maste)
<version>0.9.5-SNAPSHOT</version>
-=======
- <version>0.9.4.2-SNAPSHOT</version>
->>>>>>> BRANCH (23d990 [NO ISSUE] Bump versions to 0.[39].4.2-SNAPSHOT)
<packaging>pom</packaging>
<name>hyracks-asterix</name>
--
To view, visit https://asterix-gerrit.ics.uci.edu/3303
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a359fc5ac3f3cd50c7a4ed8b4de5d17d5900ceb
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
