diff --git a/pom.xml b/pom.xml
index cc8884fc6..7729d49b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,12 @@
                 <groupId>org.apache.hyracks</groupId>
                 <artifactId>hyracks-hdfs-2.x</artifactId>
                 <version>${hyracks.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.glassfish</groupId>
+                        <artifactId>javax.servlet</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -328,47 +334,72 @@
                 <type>jar</type>
             </dependency>
 
+            <dependency>
+                <artifactId>lucene-core</artifactId>
+                <groupId>org.apache.lucene</groupId>
+                <version>${lucene.version}</version>
+            </dependency>
+
+            <dependency>
+                <artifactId>lucene-queryparser</artifactId>
+                <groupId>org.apache.lucene</groupId>
+                <version>${lucene.version}</version>
+            </dependency>
+
+            <dependency>
+                <artifactId>lucene-analyzers-common</artifactId>
+                <groupId>org.apache.lucene</groupId>
+                <version>${lucene.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-hdfs</artifactId>
-                <version>2.7.0</version>
+                <version>${hadoop.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant-trax</artifactId>
-                <version>1.6.5</version>
-                <scope>provided</scope>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-hdfs</artifactId>
+                <version>2.2.0</version>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>stax2-api</artifactId>
-                <version>3.0.1</version>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-common</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>org.codehaus.woodstox</groupId>
-                <artifactId>woodstox-core-asl</artifactId>
-                <version>4.0.6</version>
+                <groupId>ant</groupId>
+                <artifactId>ant-trax</artifactId>
+                <version>1.6.5</version>
+                <scope>provided</scope>
             </dependency>
 
             <dependency>
-                <groupId>xalan</groupId>
-                <artifactId>serializer</artifactId>
-                <version>2.7.1</version>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>1.3.04</version>
             </dependency>
 
             <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.9.1</version>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.2.2</version>
             </dependency>
 
             <dependency>
-                <groupId>activemq</groupId>
-                <artifactId>activemq-transport-xstream</artifactId>
-                <version>2.1</version>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.0.1</version>
             </dependency>
 
             <dependency>
@@ -395,6 +426,30 @@
                 <version>1.4</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>11.0.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>20090211</version>
+            </dependency>
+
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+            </dependency>
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -671,6 +726,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <hyracks.version>0.2.17-incubating</hyracks.version>
+        <lucene.version>5.5.1</lucene.version>
+        <hadoop.version>2.7.0</hadoop.version>
         <apache-rat-plugin.version>0.11</apache-rat-plugin.version>
     </properties>
 
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index 52c32ad9d..70ac73592 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -107,16 +107,6 @@
             <artifactId>hyracks-control-nc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>algebricks-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>algebricks-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-control-common</artifactId>
@@ -124,22 +114,21 @@
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-std</artifactId>
+            <artifactId>hyracks-dataflow-common</artifactId>
         </dependency>
 
         <dependency>
-                <groupId>org.apache.hyracks</groupId>
-                <artifactId>hyracks-hdfs-core</artifactId>
+            <groupId>args4j</groupId>
+            <artifactId>args4j</artifactId>
         </dependency>
 
         <dependency>
-                <groupId>org.apache.hyracks</groupId>
-                <artifactId>hyracks-hdfs-2.x</artifactId>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
         </dependency>
     </dependencies>
 
 
-
     <reporting>
         <plugins>
             <plugin>
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index 47015a9ea..8e55183c3 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -177,73 +177,62 @@
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>algebricks-compiler</artifactId>
+            <artifactId>algebricks-common</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>algebricks-data</artifactId>
+            <artifactId>algebricks-core</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-api</artifactId>
+            <artifactId>algebricks-compiler</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-data-std</artifactId>
+            <artifactId>algebricks-rewriter</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-common</artifactId>
+            <artifactId>algebricks-data</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-std</artifactId>
+            <artifactId>algebricks-runtime</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-hdfs-2.x</artifactId>
+            <artifactId>hyracks-api</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-hdfs-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-trax</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>stax2-api</artifactId>
+            <artifactId>hyracks-data-std</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
+            <groupId>org.apache.hyracks</groupId>
+            <artifactId>hyracks-dataflow-common</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>serializer</artifactId>
+            <groupId>org.apache.hyracks</groupId>
+            <artifactId>hyracks-dataflow-std</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
+            <groupId>org.apache.hyracks</groupId>
+            <artifactId>hyracks-hdfs-2.x</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq-transport-xstream</artifactId>
+            <groupId>org.apache.hyracks</groupId>
+            <artifactId>hyracks-hdfs-core</artifactId>
         </dependency>
 
         <dependency>
@@ -266,54 +255,65 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <artifactId>lucene-core</artifactId>
             <groupId>org.apache.lucene</groupId>
-            <type>jar</type>
-            <version>5.5.1</version>
         </dependency>
+
         <dependency>
             <artifactId>lucene-queryparser</artifactId>
             <groupId>org.apache.lucene</groupId>
-            <type>jar</type>
-            <version>5.5.1</version>
         </dependency>
+
         <dependency>
             <artifactId>lucene-analyzers-common</artifactId>
             <groupId>org.apache.lucene</groupId>
-            <type>jar</type>
-            <version>5.5.1</version>
-        </dependency>
-        <dependency>
-            <artifactId>lucene-demo</artifactId>
-            <groupId>org.apache.lucene</groupId>
-            <type>jar</type>
-            <version>5.5.1</version>
-        </dependency>
-        <dependency>
-            <artifactId>lucene-backward-codecs</artifactId>
-            <groupId>org.apache.lucene</groupId>
-            <type>jar</type>
-            <version>5.5.1</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-mapreduce-client-core</artifactId>
-            <version>2.7.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <version>2.7.0</version>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-hdfs</artifactId>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index e572c3605..cb62a8f3c 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -137,20 +137,14 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.vxquery</groupId>
-            <artifactId>apache-vxquery-core</artifactId>
-            <version>0.7-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-control-cc</artifactId>
+            <artifactId>hyracks-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-control-nc</artifactId>
+            <groupId>args4j</groupId>
+            <artifactId>args4j</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 27c2bf8a0..2acbce8e7 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -143,6 +143,11 @@
             <version>0.7-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.hyracks</groupId>
             <artifactId>hyracks-api</artifactId>
@@ -165,12 +170,17 @@
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-dataflow-std</artifactId>
+            <artifactId>hyracks-dataflow-common</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hyracks</groupId>
-            <artifactId>hyracks-hdfs-2.x</artifactId>
+            <artifactId>hyracks-control-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>args4j</groupId>
+            <artifactId>args4j</artifactId>
         </dependency>
 
         <dependency>
@@ -183,10 +193,41 @@
             <artifactId>hadoop-hdfs</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-hdfs</artifactId>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-mapreduce-client-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>