You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2022/08/24 03:23:37 UTC

[bigtop] branch master updated: BIGTOP-3770: Remove Sqoop from Bigtop stack (#981)

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 13a96c0a BIGTOP-3770: Remove Sqoop from Bigtop stack (#981)
13a96c0a is described below

commit 13a96c0a6bbb55b0f070e8a8687644f906b198d0
Author: Yuqi Gu <yu...@arm.com>
AuthorDate: Wed Aug 24 11:23:31 2022 +0800

    BIGTOP-3770: Remove Sqoop from Bigtop stack (#981)
    
    Change-Id: If91a7b57f59e1d50b9fbb409ccdd2d3654220452
    Signed-off-by: Yuqi Gu <yu...@arm.com>
---
 MAINTAINERS.txt                                    |   1 -
 bigtop-ci/jenkins/jobsCreator.groovy               |   2 +-
 bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml |   2 +-
 bigtop-deploy/puppet/hieradata/site.yaml           |   1 -
 bigtop-deploy/puppet/manifests/cluster.pp          |   4 -
 .../modules/ambari/templates/ambari-agent.ini      |   1 -
 .../modules/hadoop_oozie/templates/oozie-site.xml  |   3 +-
 .../puppet/modules/sqoop/manifests/init.pp         |  22 -
 bigtop-deploy/puppet/modules/sqoop/tests/init.pp   |  16 -
 .../BGTP/1.0/hooks/before-ANY/scripts/params.py    |   2 +-
 .../1.0/hooks/before-INSTALL/scripts/params.py     |   3 +-
 .../sqoop-atlas-application.properties.xml         |  47 --
 .../1.0/services/SQOOP/configuration/sqoop-env.xml |  93 ----
 .../services/SQOOP/configuration/sqoop-site.xml    |  38 --
 .../stacks/BGTP/1.0/services/SQOOP/kerberos.json   |  20 -
 .../stacks/BGTP/1.0/services/SQOOP/metainfo.xml    |  98 ----
 .../1.0/services/SQOOP/package/scripts/__init__.py |  19 -
 .../1.0/services/SQOOP/package/scripts/params.py   |  27 -
 .../services/SQOOP/package/scripts/params_linux.py | 169 ------
 .../SQOOP/package/scripts/params_windows.py        |  30 -
 .../SQOOP/package/scripts/service_check.py         |  59 --
 .../1.0/services/SQOOP/package/scripts/sqoop.py    | 124 -----
 .../services/SQOOP/package/scripts/sqoop_client.py |  63 ---
 .../1.0/services/SQOOP/role_command_order.json     |   6 -
 .../BGTP/1.0/services/SQOOP/service_advisor.py     | 192 -------
 bigtop-packages/src/common/hadoop/init-hcfs.json   |   1 -
 bigtop-packages/src/common/hadoop/init-hdfs.sh     |   2 +-
 .../src/common/oozie/do-component-build            |   2 +-
 .../src/common/sqoop/do-component-build            |  25 -
 bigtop-packages/src/common/sqoop/install_sqoop.sh  | 172 ------
 .../src/common/sqoop/patch0-SQOOP-3462.diff        |  50 --
 .../src/common/sqoop/patch1-SQOOP-3232.diff        | 615 ---------------------
 .../common/sqoop/patch2-redist-commons-lang.diff   |  21 -
 .../patch3-hadoop333-denpendency-changes.diff      |  42 --
 .../src/common/sqoop/sqoop-metastore.sh            | 178 ------
 .../src/common/sqoop/sqoop-metastore.sh.suse       | 145 -----
 bigtop-packages/src/deb/oozie/control              |   2 +-
 bigtop-packages/src/deb/sqoop/changelog            |   1 -
 bigtop-packages/src/deb/sqoop/compat               |   1 -
 bigtop-packages/src/deb/sqoop/control              |  35 --
 bigtop-packages/src/deb/sqoop/copyright            |  15 -
 bigtop-packages/src/deb/sqoop/rules                |  39 --
 bigtop-packages/src/deb/sqoop/source/format        |   1 -
 .../src/deb/sqoop/sqoop-metastore.postinst         |  35 --
 bigtop-packages/src/deb/sqoop/sqoop.postinst       |  39 --
 bigtop-packages/src/deb/sqoop/sqoop.preinst        |  64 ---
 bigtop-packages/src/deb/sqoop/sqoop.prerm          |  57 --
 bigtop-packages/src/rpm/oozie/SPECS/oozie.spec     |   2 +-
 bigtop-packages/src/rpm/sqoop/BUILD/.gitignore     |   2 -
 bigtop-packages/src/rpm/sqoop/RPMS/.gitignore      |   0
 bigtop-packages/src/rpm/sqoop/SOURCES/.gitignore   |   0
 bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec     | 188 -------
 bigtop-packages/src/rpm/sqoop/SRPMS/.gitignore     |   0
 bigtop-tests/smoke-tests/README                    |   3 +-
 .../smoke-tests/sqoop/TestSqoopETLHsql.groovy      | 160 ------
 bigtop-tests/smoke-tests/sqoop/build.gradle        |  39 --
 bigtop-tests/smoke-tests/sqoop/log4j.properties    |  24 -
 bigtop-tests/test-artifacts/fatjar/pom.xml         |   6 -
 .../bigtop/itest/packagesmoke/BTServices.groovy    |   7 +-
 .../itest/packagesmoke/StateVerifierSqoop.groovy   |  39 --
 .../src/main/resources/apt/package_data.xml        |  21 -
 .../package/src/main/resources/apt/sqoop.xml       | 171 ------
 .../package/src/main/resources/package_data.xml    |  44 +-
 .../src/main/resources/urpmi/package_data.xml      | 110 ----
 .../src/main/resources/yum/package_data.xml        |  31 --
 .../package/src/main/resources/yum/sqoop.xml       | 157 ------
 .../src/main/resources/zypper/package_data.xml     |  30 -
 .../package/src/main/resources/zypper/sqoop.xml    | 158 ------
 bigtop-tests/test-artifacts/pom.xml                |   1 -
 bigtop-tests/test-artifacts/sqoop/pom.xml          |  46 --
 .../sqoop/IntegrationTestSqoopHBase.groovy         | 114 ----
 .../sqoop/IntegrationTestSqoopHive.groovy          | 100 ----
 .../main/resources/hbase-sqoop/create-table.hxt    |   1 -
 .../src/main/resources/hbase-sqoop/drop-table.hxt  |   2 -
 .../hbase-sqoop/expected-hbase-output.txt          |  12 -
 .../main/resources/hbase-sqoop/mysql-create-db.sql |  38 --
 .../main/resources/hbase-sqoop/mysql-load-db.sql   |  38 --
 .../main/resources/hbase-sqoop/select-table.hxt    |   1 -
 .../resources/hive-sqoop/expected-hive-output.txt  |  12 -
 .../main/resources/hive-sqoop/hive-drop-table.hql  |  15 -
 .../resources/hive-sqoop/hive-select-table.hql     |  15 -
 .../main/resources/hive-sqoop/mysql-create-db.sql  |  38 --
 .../main/resources/hive-sqoop/mysql-load-db.sql    |  38 --
 .../main/resources/mysql-files/mysql-create-db.sql |  39 --
 .../resources/mysql-files/mysql-create-tables.sql  |  54 --
 .../resources/mysql-files/mysql-insert-data.sql    |  57 --
 .../resources/mysql-files/sqoop-all-tables.out     |   2 -
 .../main/resources/mysql-files/sqoop-append.out    |  20 -
 .../main/resources/mysql-files/sqoop-columns.out   |  10 -
 .../mysql-files/sqoop-null-non-string.out          |   3 -
 .../resources/mysql-files/sqoop-null-string.out    |   3 -
 .../src/main/resources/mysql-files/sqoop-query.out |   2 -
 .../resources/mysql-files/sqoop-t_bool-export.out  |   1 -
 .../main/resources/mysql-files/sqoop-t_bool.out    |   1 -
 .../resources/mysql-files/sqoop-t_date-export.out  |   1 -
 .../main/resources/mysql-files/sqoop-t_date.out    |   1 -
 .../src/main/resources/mysql-files/sqoop-t_fp.out  |   1 -
 .../src/main/resources/mysql-files/sqoop-t_int.out |   1 -
 .../main/resources/mysql-files/sqoop-t_string.out  |   1 -
 .../main/resources/mysql-files/sqoop-testtable.out |  10 -
 .../resources/mysql-files/sqoop-where-clause.out   |   4 -
 bigtop-tests/test-execution/integration/pom.xml    |  10 -
 .../test-execution/integration/sqoop/pom.xml       | 109 ----
 bigtop-tests/test-execution/smokes/pom.xml         |   1 -
 bigtop-tests/test-execution/smokes/sqoop/pom.xml   | 103 ----
 bigtop.bom                                         |  12 +-
 pom.xml                                            |   8 -
 provisioner/utils/smoke-tests.sh                   |   1 -
 108 files changed, 13 insertions(+), 4689 deletions(-)

diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 21156c5f..ae136cfa 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -20,7 +20,6 @@ puppet recipes: jay vyas, cos, evans ye, rvs
 qfs: kstinson <ks...@quantcast.com>
 smoke-tests: jay vyas, david capwell
 spark: jay vyas, youngwoo kim
-sqoop: sean mackrory, youngwoo kim
 tajo: yeongeon kim
 test-artifacts and test-execution repos:
 tez: evans ye, oflebbe
diff --git a/bigtop-ci/jenkins/jobsCreator.groovy b/bigtop-ci/jenkins/jobsCreator.groovy
index 581f6929..8b13d2c0 100644
--- a/bigtop-ci/jenkins/jobsCreator.groovy
+++ b/bigtop-ci/jenkins/jobsCreator.groovy
@@ -19,7 +19,7 @@
 def bigtopComponents = ["bigtop-groovy", "bigtop-jsvc", "bigtop-utils",
                         "zookeeper", "hadoop", "hbase", "hive",
                         "oozie", "phoenix",
-                        "solr", "spark", "sqoop", "alluxio"]
+                        "solr", "spark", "alluxio"]
 // FIXME: it would be nice to extract the following from some static configuration file
 def targetOS = ["fedora-20",  "opensuse-12.3",  "ubuntu-14.04"]
 def gitUrl = "https://gitbox.apache.org/repos/asf/bigtop.git"
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
index 83cf9d95..c1ee8350 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
@@ -16,7 +16,7 @@
 # "$components" list. If $components isn't set then everything in the stack will
 # be installed as usual. Otherwise only a specified list will be set
 # Possible elements:
-# hadoop,yarn,hbase,alluxio,flink,solrcloud,spark,oozie,hcat,sqoop,httpfs,
+# hadoop,yarn,hbase,alluxio,flink,solrcloud,spark,oozie,hcat,httpfs,
 # pig,hive,zookeeper,ycsb
 # Example (to deploy only HDFS and YARN server and gateway parts)
 # This can be a comma-separated list or an array.
diff --git a/bigtop-deploy/puppet/hieradata/site.yaml b/bigtop-deploy/puppet/hieradata/site.yaml
index cb861c46..d467ff55 100644
--- a/bigtop-deploy/puppet/hieradata/site.yaml
+++ b/bigtop-deploy/puppet/hieradata/site.yaml
@@ -25,7 +25,6 @@ hadoop::hadoop_storage_dirs:
 #  - solrcloud
 #  - spark
 #  - spark-standalone
-#  - sqoop
 #  - tez
 #  - yarn
 #  - ycsb
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp
index c432036b..eb90beeb 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -94,10 +94,6 @@ $roles_map = {
     master => ["hcatalog-server"],
     gateway_server => ["webhcat-server"],
   },
-  sqoop => {
-    gateway_server => ["sqoop-server"],
-    client => ["sqoop-client"],
-  },
   httpfs => {
     gateway_server => ["httpfs-server"],
   },
diff --git a/bigtop-deploy/puppet/modules/ambari/templates/ambari-agent.ini b/bigtop-deploy/puppet/modules/ambari/templates/ambari-agent.ini
index e86c3559..29073cba 100644
--- a/bigtop-deploy/puppet/modules/ambari/templates/ambari-agent.ini
+++ b/bigtop-deploy/puppet/modules/ambari/templates/ambari-agent.ini
@@ -57,7 +57,6 @@ pidLookupPath=/var/run/
 [heartbeat]
 state_interval_seconds=60
 dirs=/etc/hadoop,/etc/hadoop/conf,/etc/hbase,/etc/hcatalog,/etc/hive,/etc/oozie,
-  /etc/sqoop,
   /var/run/hadoop,/var/run/zookeeper,/var/run/hbase,/var/run/templeton,/var/run/oozie,
   /var/log/hadoop,/var/log/zookeeper,/var/log/hbase,/var/run/templeton,/var/log/hive
 ; 0 - unlimited
diff --git a/bigtop-deploy/puppet/modules/hadoop_oozie/templates/oozie-site.xml b/bigtop-deploy/puppet/modules/hadoop_oozie/templates/oozie-site.xml
index 674316db..59f32d7d 100644
--- a/bigtop-deploy/puppet/modules/hadoop_oozie/templates/oozie-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop_oozie/templates/oozie-site.xml
@@ -29,14 +29,13 @@
             org.apache.oozie.action.email.EmailActionExecutor,
             org.apache.oozie.action.hadoop.HiveActionExecutor,
             org.apache.oozie.action.hadoop.ShellActionExecutor,
-            org.apache.oozie.action.hadoop.SqoopActionExecutor,
             org.apache.oozie.action.hadoop.DistcpActionExecutor
         </value>
     </property>
 
     <property>
         <name>oozie.service.SchemaService.wf.ext.schemas</name>
-        <value>shell-action-0.1.xsd,shell-action-0.2.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd</value>
+        <value>shell-action-0.1.xsd,shell-action-0.2.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd</value>
     </property>
 
     <property>
diff --git a/bigtop-deploy/puppet/modules/sqoop/manifests/init.pp b/bigtop-deploy/puppet/modules/sqoop/manifests/init.pp
deleted file mode 100644
index d7e8011b..00000000
--- a/bigtop-deploy/puppet/modules/sqoop/manifests/init.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.
-
-class sqoop {
-  class client {
-    package { "sqoop":
-      ensure => latest,
-    } 
-  }
-}
diff --git a/bigtop-deploy/puppet/modules/sqoop/tests/init.pp b/bigtop-deploy/puppet/modules/sqoop/tests/init.pp
deleted file mode 100644
index 19810bc6..00000000
--- a/bigtop-deploy/puppet/modules/sqoop/tests/init.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-sqoop::client { "test-sqoop-client": } 
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-ANY/scripts/params.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-ANY/scripts/params.py
index 1d69dac6..dce35dea 100644
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-ANY/scripts/params.py
+++ b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-ANY/scripts/params.py
@@ -259,7 +259,7 @@ sysprep_skip_create_users_and_groups = default("/configurations/cluster-env/sysp
 ignore_groupsusers_create = default("/configurations/cluster-env/ignore_groupsusers_create", False)
 fetch_nonlocal_groups = config['configurations']['cluster-env']["fetch_nonlocal_groups"]
 
-smoke_user_dirs = format("/tmp/hadoop-{smoke_user},/tmp/hsperfdata_{smoke_user},/home/{smoke_user},/tmp/{smoke_user},/tmp/sqoop-{smoke_user}")
+smoke_user_dirs = format("/tmp/hadoop-{smoke_user},/tmp/hsperfdata_{smoke_user},/home/{smoke_user},/tmp/{smoke_user}")
 if has_hbase_masters:
   hbase_user_dirs = format("/home/{hbase_user},/tmp/{hbase_user},/usr/bin/{hbase_user},/var/log/{hbase_user},{hbase_tmp_dir}")
 #repo params
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-INSTALL/scripts/params.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-INSTALL/scripts/params.py
index 0ba8332f..34b4f375 100644
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-INSTALL/scripts/params.py
+++ b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/hooks/before-INSTALL/scripts/params.py
@@ -66,7 +66,6 @@ ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_hosts", [])
 storm_server_hosts = default("/clusterHostInfo/nimbus_hosts", [])
 falcon_host =  default('/clusterHostInfo/falcon_server_hosts', [])
 
-has_sqoop_client = 'sqoop-env' in config['configurations']
 has_namenode = len(namenode_hosts) > 0
 has_hs = not len(hs_host) == 0
 has_resourcemanager = not len(rm_host) == 0
@@ -105,7 +104,7 @@ jdk_location = config['ambariLevelParams']['jdk_location']
 ignore_groupsusers_create = default("/configurations/cluster-env/ignore_groupsusers_create", False)
 host_sys_prepped = default("/ambariLevelParams/host_sys_prepped", False)
 
-smoke_user_dirs = format("/tmp/hadoop-{smoke_user},/tmp/hsperfdata_{smoke_user},/home/{smoke_user},/tmp/{smoke_user},/tmp/sqoop-{smoke_user}")
+smoke_user_dirs = format("/tmp/hadoop-{smoke_user},/tmp/hsperfdata_{smoke_user},/home/{smoke_user},/tmp/{smoke_user}")
 if has_hbase_masters:
   hbase_user_dirs = format("/home/{hbase_user},/tmp/{hbase_user},/usr/bin/{hbase_user},/var/log/{hbase_user},{hbase_tmp_dir}")
 #repo params
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-atlas-application.properties.xml b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-atlas-application.properties.xml
deleted file mode 100644
index 1364776b..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-atlas-application.properties.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * 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.
- */
--->
-<configuration>
-  <!--
-  These two security properties will only be read if the cluster is Kerberized, but ok to add them even without Kerberos.
-  It's important to have at least one property in this config file so it gets added while merging configs during EU/RU
-  from an earlier stack to HDP 2.5+.
-  Also, it allows a fresh install with Sqoop to expose this config type in the UI.
-  -->
-  <property>
-    <name>atlas.jaas.KafkaClient.option.useTicketCache</name>
-    <value>true</value>
-    <description>
-      Set this to "true" if you want the TGT to be obtained from the ticket cache.
-      Set this option to "false" if you do not want this module to use the ticket cache.
-    </description>
-    <on-ambari-upgrade add="false"/>
-  </property>
-  <property>
-    <name>atlas.jaas.KafkaClient.option.renewTicket</name>
-    <value>true</value>
-    <description>
-      Set this to "true" if you want the TGT to renew the ticket when it expires.
-      Set this option to "false" if you do not want this module to renew tickets.
-    </description>
-    <on-ambari-upgrade add="false"/>
-  </property>
-</configuration>
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-env.xml b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-env.xml
deleted file mode 100644
index 79d3d07b..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-env.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * 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.
- */
--->
-<configuration supports_adding_forbidden="true">
-  <!-- sqoop-env.sh -->
-  <property>
-    <name>sqoop.atlas.hook</name>
-    <value>false</value>
-    <display-name>Enable Atlas Hook</display-name>
-    <description>Enable Atlas Hook</description>
-    <value-attributes>
-      <type>boolean</type>
-      <overridable>false</overridable>
-    </value-attributes>
-    <on-ambari-upgrade add="false"/>
-    <depends-on>
-      <property>
-        <type>application-properties</type>
-        <name>atlas.rest.address</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>content</name>
-    <display-name>sqoop-env template</display-name>
-    <description>This is the jinja template for sqoop-env.sh file</description>
-    <value>
-# Set Hadoop-specific environment variables here.
-
-#Set path to where bin/hadoop is available
-#Set path to where bin/hadoop is available
-export HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
-
-#set the path to where bin/hbase is available
-export HBASE_HOME=${HBASE_HOME:-{{hbase_home}}}
-
-#Set the path to where bin/hive is available
-export HIVE_HOME=${HIVE_HOME:-{{hive_home}}}
-
-#Set the path for where zookeper config dir is
-export ZOOCFGDIR=${ZOOCFGDIR:-/etc/zookeeper/conf}
-
-# add libthrift in hive to sqoop class path first so hive imports work
-export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2&gt; /dev/null`:${SQOOP_USER_CLASSPATH}"
-    </value>
-    <value-attributes>
-      <type>content</type>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>sqoop_user</name>
-    <display-name>Sqoop User</display-name>
-    <description>User to run Sqoop as</description>
-    <property-type>USER</property-type>
-    <value>sqoop</value>
-    <value-attributes>
-      <type>user</type>
-      <overridable>false</overridable>
-      <user-groups>
-        <property>
-          <type>cluster-env</type>
-          <name>user_group</name>
-        </property>
-      </user-groups>
-    </value-attributes>
-    <on-ambari-upgrade add="true"/>
-  </property>
-  <property>
-    <name>jdbc_drivers</name>
-    <description>Comma separated list of additional JDBC drivers class names</description>
-    <value> </value>
-    <on-ambari-upgrade add="true"/>
-  </property>
-</configuration>
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-site.xml b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-site.xml
deleted file mode 100644
index a197fe6b..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/configuration/sqoop-site.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * 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.
- */
--->
-<configuration>
-  <!-- This property was valid in HDP 2.3 and 2.4, but removed in HDP 2.5 -->
-  <property>
-    <name>sqoop.job.data.publish.class</name>
-    <on-ambari-upgrade add="true"/>
-    <depends-on>
-      <property>
-        <type>sqoop-env</type>
-        <name>sqoop.atlas.hook</name>
-      </property>
-      <property>
-        <type>application-properties</type>
-        <name>atlas.rest.address</name>
-      </property>
-    </depends-on>
-  </property>
-</configuration>
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/kerberos.json b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/kerberos.json
deleted file mode 100644
index de12e7c6..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/kerberos.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "services": [
-    {
-      "name": "SQOOP",
-      "configurations": [
-        {
-          "sqoop-atlas-application.properties": {
-            "atlas.jaas.KafkaClient.option.useTicketCache": "true",
-            "atlas.jaas.KafkaClient.option.renewTicket": "true"
-          }
-        }
-      ],
-      "components": [
-        {
-          "name": "SQOOP"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/metainfo.xml b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/metainfo.xml
deleted file mode 100644
index 214f4584..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/metainfo.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   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.
--->
-<metainfo>
-    <schemaVersion>2.0</schemaVersion>
-    <services>
-        <service>
-            <name>SQOOP</name>
-            <displayName>Sqoop</displayName>
-            <comment>Tool for transferring bulk data between Apache Hadoop and
-                structured data stores such as relational databases
-            </comment>
-            <version>Bigtop+3.1</version>
-
-            <components>
-                <component>
-                    <name>SQOOP</name>
-                    <displayName>Sqoop Client</displayName>
-                    <category>CLIENT</category>
-                    <cardinality>1+</cardinality>
-                    <versionAdvertised>true</versionAdvertised>
-                    <dependencies>
-                        <dependency>
-                            <name>HDFS/HDFS_CLIENT</name>
-                            <scope>host</scope>
-                            <auto-deploy>
-                                <enabled>true</enabled>
-                            </auto-deploy>
-                        </dependency>
-                        <dependency>
-                            <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
-                            <scope>host</scope>
-                            <auto-deploy>
-                                <enabled>true</enabled>
-                            </auto-deploy>
-                        </dependency>
-                    </dependencies>
-                    <commandScript>
-                        <script>scripts/sqoop_client.py</script>
-                        <scriptType>PYTHON</scriptType>
-                    </commandScript>
-                    <configFiles>
-                        <configFile>
-                            <type>xml</type>
-                            <fileName>sqoop-site.xml</fileName>
-                            <dictionaryName>sqoop-site</dictionaryName>
-                        </configFile>
-                        <configFile>
-                            <type>env</type>
-                            <fileName>sqoop-env.sh</fileName>
-                            <dictionaryName>sqoop-env</dictionaryName>
-                        </configFile>
-                    </configFiles>
-                </component>
-            </components>
-            <osSpecifics>
-                <osSpecific>
-                    <osFamily>any</osFamily>
-                    <packages>
-                        <package>
-                            <name>sqoop</name>
-                        </package>
-                    </packages>
-                </osSpecific>
-            </osSpecifics>
-            <commandScript>
-                <script>scripts/service_check.py</script>
-                <scriptType>PYTHON</scriptType>
-                <timeout>300</timeout>
-            </commandScript>
-
-            <requiredServices>
-                <service>HDFS</service>
-            </requiredServices>
-
-            <configuration-dependencies>
-                <config-type>sqoop-env</config-type>
-                <config-type>sqoop-site</config-type>
-                <config-type>application.properties</config-type>
-                <config-type>application-properties</config-type>
-            </configuration-dependencies>
-        </service>
-    </services>
-</metainfo>
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/__init__.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/__init__.py
deleted file mode 100644
index 5561e108..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-"""
-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.
-
-"""
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params.py
deleted file mode 100644
index 61573eef..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-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.
-
-"""
-from ambari_commons import OSCheck
-from resource_management.libraries.functions.default import default
-
-if OSCheck.is_windows_family():
-  from params_windows import *
-else:
-  from params_linux import *
-
-
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params_linux.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params_linux.py
deleted file mode 100644
index 95d0ed10..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params_linux.py
+++ /dev/null
@@ -1,169 +0,0 @@
-"""
-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.
-
-"""
-
-import os
-
-from resource_management.libraries.functions.version import format_stack_version
-from resource_management.libraries.functions.default import default
-from resource_management.libraries.functions.get_kinit_path import get_kinit_path
-from resource_management.libraries.script import Script
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions import StackFeature
-from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources
-from resource_management.libraries.functions.stack_features import check_stack_feature
-from resource_management.libraries.functions.expect import expect
-from resource_management.libraries.resources.hdfs_resource import HdfsResource
-from resource_management.core.exceptions import Fail
-
-
-# a map of the Ambari role to the component name
-# for use with <stack-root>/current/<component>
-SERVER_ROLE_DIRECTORY_MAP = {
-  'SQOOP' : 'sqoop-client'
-}
-
-component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "SQOOP")
-
-config = Script.get_config()
-stack_root = Script.get_stack_root()
-
-# Needed since this is an Atlas Hook service.
-cluster_name = config['clusterName']
-
-ambari_server_hostname = config['ambariLevelParams']['ambari_server_host']
-
-stack_name = default("/clusterLevelParams/stack_name", None)
-
-stack_version_unformatted = config['clusterLevelParams']['stack_version']
-stack_version_formatted = format_stack_version(stack_version_unformatted)
-
-agent_stack_retry_on_unavailability = config['ambariLevelParams']['agent_stack_retry_on_unavailability']
-agent_stack_retry_count = expect("/ambariLevelParams/agent_stack_retry_count", int)
-
-# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade
-version = default("/commandParams/version", None)
-
-# default hadoop params
-sqoop_conf_dir = "/usr/lib/sqoop/conf"
-sqoop_lib = "/usr/lib/sqoop/lib"
-hadoop_home = '/usr/lib/hadoop'
-hbase_home = "/usr/lib/hbase"
-hive_home = "/usr/lib/hive"
-sqoop_bin_dir = "/usr/bin"
-zoo_conf_dir = "/etc/zookeeper"
-
-# For stack versions supporting rolling upgrade
-if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
-  sqoop_conf_dir = format("{stack_root}/current/sqoop-client/conf")
-  sqoop_lib = format("{stack_root}/current/sqoop-client/lib")
-  hadoop_home = stack_select.get_hadoop_dir("home")
-  hbase_home = format("{stack_root}/current/hbase-client")
-  hive_home = format("{stack_root}/current/hive-client")
-  sqoop_bin_dir = format("{stack_root}/current/sqoop-client/bin/")
-  zoo_conf_dir = format("{stack_root}/current/zookeeper-client/conf")
-
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-smokeuser = config['configurations']['cluster-env']['smokeuser']
-smokeuser_principal = config['configurations']['cluster-env']['smokeuser_principal_name']
-user_group = config['configurations']['cluster-env']['user_group']
-sqoop_env_sh_template = config['configurations']['sqoop-env']['content']
-hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
-
-sqoop_user = config['configurations']['sqoop-env']['sqoop_user']
-
-smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
-kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
-#JDBC driver jar name
-sqoop_jdbc_drivers_dict = []
-sqoop_jdbc_drivers_name_dict = {}
-sqoop_jdbc_drivers_to_remove = {}
-if "jdbc_drivers" in config['configurations']['sqoop-env']:
-  sqoop_jdbc_drivers = config['configurations']['sqoop-env']['jdbc_drivers'].split(',')
-
-  for driver_name in sqoop_jdbc_drivers:
-    previous_jdbc_jar_name = None
-    driver_name = driver_name.strip()
-    if driver_name and not driver_name == '':
-      if driver_name == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
-        jdbc_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
-        previous_jdbc_jar_name = default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
-        jdbc_driver_name = "mssql"
-      elif driver_name == "com.mysql.jdbc.Driver":
-        jdbc_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
-        previous_jdbc_jar_name = default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
-        jdbc_driver_name = "mysql"
-      elif driver_name == "org.postgresql.Driver":
-        jdbc_name = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
-        previous_jdbc_jar_name = default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
-        jdbc_driver_name = "postgres"
-      elif driver_name == "oracle.jdbc.driver.OracleDriver":
-        jdbc_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
-        previous_jdbc_jar_name = default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
-        jdbc_driver_name = "oracle"
-      elif driver_name == "org.hsqldb.jdbc.JDBCDriver":
-        jdbc_name = default("/ambariLevelParams/custom_hsqldb_jdbc_name", None)
-        previous_jdbc_jar_name = default("/ambariLevelParams/previous_custom_hsqldb_jdbc_name", None)
-        jdbc_driver_name = "hsqldb"
-      else: raise Fail(format("JDBC driver '{driver_name}' not supported."))
-    else:
-      continue
-    sqoop_jdbc_drivers_dict.append(jdbc_name)
-    sqoop_jdbc_drivers_to_remove[jdbc_name] = previous_jdbc_jar_name
-    sqoop_jdbc_drivers_name_dict[jdbc_name] = jdbc_driver_name
-jdk_location = config['ambariLevelParams']['jdk_location']
-
-
-########################################################
-############# Atlas related params #####################
-########################################################
-#region Atlas Hooks
-sqoop_atlas_application_properties = default('/configurations/sqoop-atlas-application.properties', {})
-enable_atlas_hook = default('/configurations/sqoop-env/sqoop.atlas.hook', False)
-atlas_hook_filename = default('/configurations/atlas-env/metadata_conf_file', 'atlas-application.properties')
-#endregion
-
-hostname = config['agentLevelParams']['hostname']
-hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
-hadoop_bin_dir = stack_select.get_hadoop_dir("bin")
-hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
-hdfs_principal_name = default('/configurations/hadoop-env/hdfs_principal_name', 'missing_principal').replace("_HOST", hostname)
-hdfs_site = config['configurations']['hdfs-site']
-default_fs = config['configurations']['core-site']['fs.defaultFS']
-dfs_type = default("/clusterLevelParams/dfs_type", "")
-
-import functools
-#create partial functions with common arguments for every HdfsResource call
-#to create hdfs directory we need to call params.HdfsResource in code
-HdfsResource = functools.partial(
- HdfsResource,
-  user = hdfs_user,
-  hdfs_resource_ignore_file = "/var/lib/ambari-agent/data/.hdfs_resource_ignore",
-  security_enabled = security_enabled,
-  keytab = hdfs_user_keytab,
-  kinit_path_local = kinit_path_local,
-  hadoop_bin_dir = hadoop_bin_dir,
-  hadoop_conf_dir = hadoop_conf_dir,
-  principal_name = hdfs_principal_name,
-  hdfs_site = hdfs_site,
-  default_fs = default_fs,
-  immutable_paths = get_not_managed_resources(),
-  dfs_type = dfs_type
- )
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params_windows.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params_windows.py
deleted file mode 100644
index f9307650..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/params_windows.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-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.
-
-"""
-
-from resource_management.libraries.script import Script
-import os
-
-config = Script.get_config()
-
-sqoop_user = "sqoop"
-
-stack_root = os.path.abspath(os.path.join(os.environ["HADOOP_HOME"], ".."))
-sqoop_env_cmd_template = config['configurations']['sqoop-env']['content']
-sqoop_home_dir = os.environ["SQOOP_HOME"]
-sqoop_conf_dir = os.path.join(sqoop_home_dir, "conf")
\ No newline at end of file
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/service_check.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/service_check.py
deleted file mode 100644
index 5b48ffde..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/service_check.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-"""
-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.
-
-"""
-
-
-from resource_management.libraries.script.script import Script
-from resource_management.core.resources import Execute
-from resource_management.libraries.functions.default import default
-from resource_management.libraries.functions import format
-from ambari_commons.os_family_impl import OsFamilyImpl
-from ambari_commons import OSConst
-import os
-
-class SqoopServiceCheck(Script):
-  pass
-
-@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
-class SqoopServiceCheckDefault(SqoopServiceCheck):
-
-  def service_check(self, env):
-    import params
-    env.set_params(params)
-    if params.security_enabled:
-      Execute(format("{kinit_path_local}  -kt {smoke_user_keytab} {smokeuser_principal}"),
-              user = params.smokeuser,
-      )
-    Execute("sqoop version",
-            user = params.smokeuser,
-            path = params.sqoop_bin_dir,
-            logoutput = True
-    )
-
-@OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY)
-class SqoopServiceCheckWindows(SqoopServiceCheck):
-  def service_check(self, env):
-    import params
-    env.set_params(params)
-    smoke_cmd = os.path.join(params.stack_root,"Run-SmokeTests.cmd")
-    service = "SQOOP"
-    Execute(format("cmd /C {smoke_cmd} {service}"), logoutput=True)
-
-if __name__ == "__main__":
-  SqoopServiceCheck().execute()
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/sqoop.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/sqoop.py
deleted file mode 100644
index 09741f31..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/sqoop.py
+++ /dev/null
@@ -1,124 +0,0 @@
-"""
-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.
-
-"""
-# Python Imports
-import os
-
-# Local Imports
-from resource_management.core.source import InlineTemplate, DownloadSource
-from resource_management.libraries.functions import format
-from resource_management.libraries.functions.get_config import get_config
-from resource_management.libraries.resources.xml_config import XmlConfig
-from resource_management.core.resources.system import File, Link, Directory
-from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
-from ambari_commons import OSConst
-from resource_management.libraries.functions.setup_atlas_hook import has_atlas_in_cluster, setup_atlas_hook, setup_atlas_jar_symlinks
-from ambari_commons.constants import SERVICE
-
-
-@OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
-def sqoop(type=None):
-  import params
-  File(os.path.join(params.sqoop_conf_dir, "sqoop-env.cmd"),
-       content=InlineTemplate(params.sqoop_env_cmd_template)
-  )
-
-@OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
-def sqoop(type=None):
-  import params
-  Link(params.sqoop_lib + "/mysql-connector-java.jar",
-       to = '/usr/share/java/mysql-connector-java.jar'
-  )
-
-  jdbc_connector()
-  
-  Directory(params.sqoop_conf_dir,
-            owner = params.sqoop_user,
-            group = params.user_group,
-            create_parents = True
-  )
-
-  configs = {}
-  sqoop_site_config = get_config('sqoop-site')
-  if sqoop_site_config:
-    configs.update(sqoop_site_config)
-
-    XmlConfig("sqoop-site.xml",
-              conf_dir = params.sqoop_conf_dir,
-              configurations = configs,
-              configuration_attributes=params.config['configurationAttributes']['sqoop-site'],
-              owner = params.sqoop_user,
-              group = params.user_group
-              )
-
-  # Generate atlas-application.properties.xml file and symlink the hook jars
-  if params.enable_atlas_hook:
-    atlas_hook_filepath = os.path.join(params.sqoop_conf_dir, params.atlas_hook_filename)
-    setup_atlas_hook(SERVICE.SQOOP, params.sqoop_atlas_application_properties, atlas_hook_filepath, params.sqoop_user, params.user_group)
-    setup_atlas_jar_symlinks("sqoop", params.sqoop_lib)
-
-
-  File(format("{sqoop_conf_dir}/sqoop-env.sh"),
-    owner=params.sqoop_user,
-    group = params.user_group,
-    content=InlineTemplate(params.sqoop_env_sh_template)
-  )
-  update_config_permissions(["sqoop-env-template.sh",
-                             "sqoop-site-template.xml",
-                             "sqoop-site.xml"])
-  pass
-
-def update_config_permissions(names):
-  import params
-  for filename in names:
-    full_filename = os.path.join(params.sqoop_conf_dir, filename)
-    File(full_filename,
-          owner = params.sqoop_user,
-          group = params.user_group,
-          only_if = format("test -e {full_filename}")
-    )
-
-def jdbc_connector():
-  import params
-  from urllib2 import HTTPError
-  from resource_management import Fail
-  for jar_name in params.sqoop_jdbc_drivers_dict:
-    if not jar_name or 'mysql' in jar_name:
-      continue
-    downloaded_custom_connector = format("{sqoop_lib}/{jar_name}")
-    custom_connector_to_remove = format("{sqoop_lib}/" + str(params.sqoop_jdbc_drivers_to_remove[jar_name]))
-    jdbc_driver_label = params.sqoop_jdbc_drivers_name_dict[jar_name]
-    driver_curl_source = format("{jdk_location}/{jar_name}")
-    environment = {
-      "no_proxy": format("{ambari_server_hostname}")
-    }
-    try:
-      if custom_connector_to_remove and os.path.isfile(custom_connector_to_remove):
-        File(custom_connector_to_remove, action='delete')
-
-      File(downloaded_custom_connector,
-           content = DownloadSource(driver_curl_source),
-           mode = 0644,
-      )
-    except HTTPError:
-      error_string = format("Could not download {driver_curl_source}\n\
-                 Please upload jdbc driver to server by run command:\n\
-                 ambari-server setup --jdbc-db={jdbc_driver_label} --jdbc-driver=<PATH TO DRIVER>\n\
-                 at {ambari_server_hostname}") 
-      raise Fail(error_string)
-                 
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/sqoop_client.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/sqoop_client.py
deleted file mode 100644
index 7c4ba854..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/package/scripts/sqoop_client.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-"""
-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.
-
-"""
-
-from resource_management.core.exceptions import ClientComponentHasNoStatus
-from resource_management.core.resources.system import Execute
-from resource_management.libraries.functions.default import default
-from resource_management.libraries.script.script import Script
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions import StackFeature
-from resource_management.libraries.functions.copy_tarball import copy_to_hdfs
-from resource_management.libraries.functions.stack_features import check_stack_feature
-from sqoop import sqoop
-from ambari_commons.os_family_impl import OsFamilyImpl
-from ambari_commons import OSConst
-
-class SqoopClient(Script):
-  def install(self, env):
-    self.install_packages(env)
-    self.configure(env)
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-    sqoop(type='client')
-
-  def status(self, env):
-    raise ClientComponentHasNoStatus()
-
-@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
-class SqoopClientDefault(SqoopClient):
-  def pre_upgrade_restart(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-
-    if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version):
-      stack_select.select_packages(params.version)
-      copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, use_upgrading_version_during_upgrade=True)
-
-
-@OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY)
-class SqoopClientWindows(SqoopClient):
-  pass
-
-if __name__ == "__main__":
-  SqoopClient().execute()
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/role_command_order.json b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/role_command_order.json
deleted file mode 100644
index f9a6cb48..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/role_command_order.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "general_deps" : {
-    "_comment" : "dependencies for SQOOP",
-    "SQOOP_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"]
-  }
-}
diff --git a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/service_advisor.py b/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/service_advisor.py
deleted file mode 100644
index dbd7b3d6..00000000
--- a/bigtop-packages/src/common/bigtop-ambari-mpack/bgtp-ambari-mpack/src/main/resources/stacks/BGTP/1.0/services/SQOOP/service_advisor.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env ambari-python-wrap
-"""
-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.
-"""
-
-# Python imports
-import imp
-import os
-import traceback
-import re
-import socket
-import fnmatch
-
-
-from resource_management.core.logger import Logger
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../../')
-PARENT_FILE = os.path.join(STACKS_DIR, 'service_advisor.py')
-
-try:
-  with open(PARENT_FILE, 'rb') as fp:
-    service_advisor = imp.load_module('service_advisor', fp, PARENT_FILE, ('.py', 'rb', imp.PY_SOURCE))
-except Exception as e:
-  traceback.print_exc()
-  print "Failed to load parent"
-
-class SqoopServiceAdvisor(service_advisor.ServiceAdvisor):
-
-  def __init__(self, *args, **kwargs):
-    self.as_super = super(SqoopServiceAdvisor, self)
-    self.as_super.__init__(*args, **kwargs)
-
-    # Always call these methods
-    self.modifyMastersWithMultipleInstances()
-    self.modifyCardinalitiesDict()
-    self.modifyHeapSizeProperties()
-    self.modifyNotValuableComponents()
-    self.modifyComponentsNotPreferableOnServer()
-    self.modifyComponentLayoutSchemes()
-
-  def modifyMastersWithMultipleInstances(self):
-    """
-    Modify the set of masters with multiple instances.
-    Must be overriden in child class.
-    """
-    # Nothing to do
-    pass
-
-  def modifyCardinalitiesDict(self):
-    """
-    Modify the dictionary of cardinalities.
-    Must be overriden in child class.
-    """
-    # Nothing to do
-    pass
-
-  def modifyHeapSizeProperties(self):
-    """
-    Modify the dictionary of heap size properties.
-    Must be overriden in child class.
-    """
-    pass
-
-  def modifyNotValuableComponents(self):
-    """
-    Modify the set of components whose host assignment is based on other services.
-    Must be overriden in child class.
-    """
-    # Nothing to do
-    pass
-
-  def modifyComponentsNotPreferableOnServer(self):
-    """
-    Modify the set of components that are not preferable on the server.
-    Must be overriden in child class.
-    """
-    # Nothing to do
-    pass
-
-  def modifyComponentLayoutSchemes(self):
-    """
-    Modify layout scheme dictionaries for components.
-    The scheme dictionary basically maps the number of hosts to
-    host index where component should exist.
-    Must be overriden in child class.
-    """
-    # Nothing to do
-    pass
-
-  def getServiceComponentLayoutValidations(self, services, hosts):
-    """
-    Get a list of errors.
-    Must be overriden in child class.
-    """
-
-    return self.getServiceComponentCardinalityValidations(services, hosts, "SQOOP")
-
-  def getServiceConfigurationRecommendations(self, configurations, clusterData, services, hosts):
-    """
-    Entry point.
-    Must be overriden in child class.
-    """
-    #Logger.info("Class: %s, Method: %s. Recommending Service Configurations." %
-    #            (self.__class__.__name__, inspect.stack()[0][3]))
-
-    recommender = SqoopRecommender()
-    recommender.recommendSqoopConfigurationsFromHDP23(configurations, clusterData, services, hosts)
-
-
-
-  def getServiceConfigurationsValidationItems(self, configurations, recommendedDefaults, services, hosts):
-    """
-    Entry point.
-    Validate configurations for the service. Return a list of errors.
-    The code for this function should be the same for each Service Advisor.
-    """
-    #Logger.info("Class: %s, Method: %s. Validating Configurations." %
-    #            (self.__class__.__name__, inspect.stack()[0][3]))
-
-    validator = SqoopValidator()
-    # Calls the methods of the validator using arguments,
-    # method(siteProperties, siteRecommendations, configurations, services, hosts)
-    return validator.validateListOfConfigUsingMethod(configurations, recommendedDefaults, services, hosts, validator.validators)
-
-
-
-class SqoopRecommender(service_advisor.ServiceAdvisor):
-  """
-  Sqoop Recommender suggests properties when adding the service for the first time or modifying configs via the UI.
-  """
-
-  def __init__(self, *args, **kwargs):
-    self.as_super = super(SqoopRecommender, self)
-    self.as_super.__init__(*args, **kwargs)
-
-
-  def recommendSqoopConfigurationsFromHDP23(self, configurations, clusterData, services, hosts):
-    putSqoopSiteProperty = self.putProperty(configurations, "sqoop-site", services)
-    putSqoopEnvProperty = self.putProperty(configurations, "sqoop-env", services)
-
-    enable_external_atlas_for_sqoop = False
-    enable_atlas_hook = False
-    servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
-    if 'sqoop-atlas-application.properties' in services['configurations'] and 'enable.external.atlas.for.sqoop' in services['configurations']['sqoop-atlas-application.properties']['properties']:
-      enable_external_atlas_for_sqoop = services['configurations']['sqoop-atlas-application.properties']['properties']['enable.external.atlas.for.sqoop'].lower() == "true"
-
-    if "ATLAS" in servicesList:
-      putSqoopEnvProperty("sqoop.atlas.hook", "true")
-    elif enable_external_atlas_for_sqoop:
-      putSqoopEnvProperty("sqoop.atlas.hook", "true")
-    else:
-      putSqoopEnvProperty("sqoop.atlas.hook", "false")
-
-    if 'sqoop-env' in configurations and 'sqoop.atlas.hook' in configurations['sqoop-env']['properties']:
-      enable_atlas_hook = configurations['sqoop-env']['properties']['sqoop.atlas.hook'] == "true"
-    elif 'sqoop-env' in services['configurations'] and 'sqoop.atlas.hook' in services['configurations']['sqoop-env']['properties']:
-      enable_atlas_hook = services['configurations']['sqoop-env']['properties']['sqoop.atlas.hook'] == "true"
-
-    if enable_atlas_hook:
-      putSqoopSiteProperty('sqoop.job.data.publish.class', 'org.apache.atlas.sqoop.hook.SqoopHook')
-    else:
-      putSqoopSitePropertyAttribute = self.putPropertyAttribute(configurations, "sqoop-site")
-      putSqoopSitePropertyAttribute('sqoop.job.data.publish.class', 'delete', 'true')
-
-
-
-class SqoopValidator(service_advisor.ServiceAdvisor):
-  """
-  Sqoop Validator checks the correctness of properties whenever the service is first added or the user attempts to
-  change configs via the UI.
-  """
-
-  def __init__(self, *args, **kwargs):
-    self.as_super = super(SqoopValidator, self)
-    self.as_super.__init__(*args, **kwargs)
-
-    self.validators = []
diff --git a/bigtop-packages/src/common/hadoop/init-hcfs.json b/bigtop-packages/src/common/hadoop/init-hcfs.json
index 40df592f..a004c16d 100644
--- a/bigtop-packages/src/common/hadoop/init-hcfs.json
+++ b/bigtop-packages/src/common/hadoop/init-hcfs.json
@@ -73,7 +73,6 @@
     ["/user/root","777","root",null],
     ["/user/hue","777","hue","hue"],
     ["/user/livy","777","livy","livy"],
-    ["/user/sqoop","777","sqoop",null],
     ["/user/spark","777","spark"],
     ["/user/oozie","777","oozie"],
     ["/user/oozie/share",null,null,null],
diff --git a/bigtop-packages/src/common/hadoop/init-hdfs.sh b/bigtop-packages/src/common/hadoop/init-hdfs.sh
index a669e1d3..7098afa3 100755
--- a/bigtop-packages/src/common/hadoop/init-hdfs.sh
+++ b/bigtop-packages/src/common/hadoop/init-hdfs.sh
@@ -19,7 +19,7 @@
 # Use this script to initialize HDFS directory structure for various components
 # to run. This script can be run from any node in the Hadoop cluster but should
 # only be run once by one node only. If you are planning on using oozie, we
-# recommend that you run this script from a node that has hive, pig, sqoop, etc.
+# recommend that you run this script from a node that has hive, pig, etc.
 # installed. Unless you are using psuedo distributed cluster, this node is most
 # likely NOT your namenode
 # Steps to be performed before running this script:
diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build
index 7640a34f..9a2ca055 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -84,7 +84,7 @@ sed -i.bak "/http:\/\/repository.codehaus.org/a\\
 
 export MAVEN_OPTS="-Xmx2g"
 # Invoke Oozie build script
-${WORKDIR}/bin/mkdistro.sh -DjavaVersion=${JDK_VERSION} -DtargetJavaVersion=${JDK_VERSION} -DsourceJavaVersion=${JDK_VERSION} -DminJavaVersion=${JDK_VERSION} -DskipTests -Phadoop-3 -Pspark-2 -Puber -Dhadoop.version=${HADOOP_VERSION} -Dhadoop.auth.version=${HADOOP_VERSION} -Dhive.version=${HIVE_VERSION} -Dsqoop.version=${SQOOP_VERSION} -Dspark.version=${SPARK_VERSION} -Dspark.scala.binary.version=${SCALA_VERSION%.*} -Djackson.version=2.9.10 ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/re [...]
+${WORKDIR}/bin/mkdistro.sh -DjavaVersion=${JDK_VERSION} -DtargetJavaVersion=${JDK_VERSION} -DsourceJavaVersion=${JDK_VERSION} -DminJavaVersion=${JDK_VERSION} -DskipTests -Phadoop-3 -Pspark-2 -Puber -Dhadoop.version=${HADOOP_VERSION} -Dhadoop.auth.version=${HADOOP_VERSION} -Dhive.version=${HIVE_VERSION} -Dspark.version=${SPARK_VERSION} -Dspark.scala.binary.version=${SCALA_VERSION%.*} -Djackson.version=2.9.10 ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
 MKDISTRO_RESULT=$?
 if [ "${MKDISTRO_RESULT}" != "0" ]; then
   echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"
diff --git a/bigtop-packages/src/common/sqoop/do-component-build b/bigtop-packages/src/common/sqoop/do-component-build
deleted file mode 100755
index 4818213d..00000000
--- a/bigtop-packages/src/common/sqoop/do-component-build
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# 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.
-
-set -ex
-. `dirname ${0}`/bigtop.bom
-
-ant -f build.xml \
-  -Dhadoop.version=$HADOOP_VERSION \
-  -Dhbase.version=$HBASE_VERSION \
-  -Dhcatalog.version=$HIVE_VERSION \
-  -Dzookeeper.version=$ZOOKEEPER_VERSION \
-  package jar "$@"
diff --git a/bigtop-packages/src/common/sqoop/install_sqoop.sh b/bigtop-packages/src/common/sqoop/install_sqoop.sh
deleted file mode 100755
index ca8ef3b1..00000000
--- a/bigtop-packages/src/common/sqoop/install_sqoop.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-set -ex
-
-usage() {
-  echo "
-usage: $0 <options>
-  Required not-so-options:
-     --build-dir=DIR             path to sqoopdist.dir
-     --prefix=PREFIX             path to install into
-     --extra-dir=DIR             path to Bigtop distribution files
-
-  Optional options:
-     --doc-dir=DIR               path to install docs into [/usr/share/doc/sqoop]
-     --lib-dir=DIR               path to install sqoop home [/usr/lib/sqoop]
-     --installed-lib-dir=DIR     path where lib-dir will end up on target system
-     --bin-dir=DIR               path to install bins [/usr/bin]
-     --conf-dir=DIR              path to configuration files provided by the package [/etc/sqoop/conf.dist]
-     --examples-dir=DIR          path to install examples [doc-dir/examples]
-     ... [ see source for more similar options ]
-  "
-  exit 1
-}
-
-OPTS=$(getopt \
-  -n $0 \
-  -o '' \
-  -l 'prefix:' \
-  -l 'doc-dir:' \
-  -l 'lib-dir:' \
-  -l 'conf-dir:' \
-  -l 'installed-lib-dir:' \
-  -l 'bin-dir:' \
-  -l 'examples-dir:' \
-  -l 'extra-dir:' \
-  -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
-    usage
-fi
-
-eval set -- "$OPTS"
-set -ex
-while true ; do
-    case "$1" in
-        --prefix)
-        PREFIX=$2 ; shift 2
-        ;;
-        --build-dir)
-        BUILD_DIR=$2 ; shift 2
-        ;;
-        --doc-dir)
-        DOC_DIR=$2 ; shift 2
-        ;;
-        --lib-dir)
-        LIB_DIR=$2 ; shift 2
-        ;;
-        --conf-dir)
-        CONF_DIR=$2 ; shift 2
-        ;;
-        --installed-lib-dir)
-        INSTALLED_LIB_DIR=$2 ; shift 2
-        ;;
-        --bin-dir)
-        BIN_DIR=$2 ; shift 2
-        ;;
-        --examples-dir)
-        EXAMPLES_DIR=$2 ; shift 2
-        ;;
-        --extra-dir)
-        EXTRA_DIR=$2 ; shift 2
-        ;;
-        --)
-        shift ; break
-        ;;
-        *)
-        echo "Unknown option: $1"
-        usage
-        exit 1
-        ;;
-    esac
-done
-
-for var in PREFIX BUILD_DIR ; do
-  if [ -z "$(eval "echo \$$var")" ]; then
-    echo Missing param: $var
-    usage
-  fi
-done
-
-DOC_DIR=${DOC_DIR:-/usr/share/doc/sqoop}
-LIB_DIR=${LIB_DIR:-/usr/lib/sqoop}
-BIN_DIR=${BIN_DIR:-/usr/lib/sqoop/bin}
-ETC_DIR=${ETC_DIR:-/etc/sqoop}
-MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
-CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist}
-
-install -d -m 0755 ${PREFIX}/${LIB_DIR}
-
-install -d -m 0755 ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/sqoop*.jar ${PREFIX}/${LIB_DIR}
-
-install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib
-cp -a ${BUILD_DIR}/lib/*.jar ${PREFIX}/${LIB_DIR}/lib
-
-#install -d -m 0755 ${PREFIX}/${LIB_DIR}/shims
-#cp -a shims/*.jar ${PREFIX}/${LIB_DIR}/shims
-
-install -d -m 0755 $PREFIX/usr/bin
-
-install -d -m 0755 $PREFIX/${BIN_DIR}
-for f in `ls ${BUILD_DIR}/bin/ | grep -v .cmd`; do
-    cp ${BUILD_DIR}/bin/$f $PREFIX/${BIN_DIR}
-done
-
-
-install -d -m 0755 $PREFIX/${DOC_DIR}
-cp ${BUILD_DIR}/docs/*.html  $PREFIX/${DOC_DIR}
-cp ${BUILD_DIR}/docs/*.css $PREFIX/${DOC_DIR}
-cp -r ${BUILD_DIR}/docs/api $PREFIX/${DOC_DIR}
-cp -r ${BUILD_DIR}/docs/images $PREFIX/${DOC_DIR}
-
-
-install -d -m 0755 $PREFIX/$MAN_DIR
-for i in sqoop sqoop-codegen sqoop-export sqoop-import-all-tables sqoop-version sqoop-create-hive-table sqoop-help sqoop-list-databases sqoop-eval sqoop-import sqoop-list-tables sqoop-job sqoop-metastore sqoop-merge
-    do echo "Copying manpage $i"
-    cp ${BUILD_DIR}/docs/man/$i* $PREFIX/$MAN_DIR
-    echo "Creating wrapper for $i"
-    wrapper=$PREFIX/usr/bin/$i
-    mkdir -p `dirname $wrapper`
-    cat > $wrapper <<EOF
-#!/bin/bash
-
-# Autodetect JAVA_HOME if not defined
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
-
-SQOOP_JARS=\`ls /var/lib/sqoop/*.jar 2>/dev/null\`
-if [ -n "\${SQOOP_JARS}" ]; then
-    export HADOOP_CLASSPATH=\$(JARS=(\${SQOOP_JARS}); IFS=:; echo "\${HADOOP_CLASSPATH}:\${JARS[*]}")
-fi
-
-export SQOOP_HOME=$LIB_DIR
-exec $BIN_DIR/$i "\$@"
-EOF
-   chmod 0755 $wrapper
-done
-
-install -d -m 0755 $PREFIX/$CONF_DIR
-(cd ${BUILD_DIR}/conf && tar cf - .) | (cd $PREFIX/$CONF_DIR && tar xf - && rm -rf *.cmd .gitignore)
-
-unlink $PREFIX/$LIB_DIR/conf || /bin/true
-ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
-
-install -d -m 0755 ${PREFIX}/var/lib/sqoop
-
-cp ${BUILD_DIR}/{LICENSE,NOTICE}.txt ${PREFIX}/${LIB_DIR}/
-
diff --git a/bigtop-packages/src/common/sqoop/patch0-SQOOP-3462.diff b/bigtop-packages/src/common/sqoop/patch0-SQOOP-3462.diff
deleted file mode 100644
index 5daee696..00000000
--- a/bigtop-packages/src/common/sqoop/patch0-SQOOP-3462.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From d236894985b5fdf1423598da0139a5f82737c9e8 Mon Sep 17 00:00:00 2001
-From: Istvan Toth <st...@apache.org>
-Date: Thu, 16 Jan 2020 08:55:23 +0100
-Subject: [PATCH] SQOOP-3462 Sqoop ant build fails due to outdated maven repo
- URLs
-
-use https://repo1.maven.org URL int ant build.
----
- build.xml           | 4 ++--
- ivy/ivysettings.xml | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 9245f3e42..84ab6dfb8 100644
---- a/build.xml
-+++ b/build.xml
-@@ -169,9 +169,9 @@
-   <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml"/>
-   <property name="ivy.jar" location="${lib.dir}/ivy-${ivy.version}.jar"/>
-   <property name="ivy_repo_url"
--  value="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" />
-+  value="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" />
-   <property name="mvn_repo_url"
--  value="http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks/${mvn.version}/maven-ant-tasks-${mvn.version}.jar"/>
-+  value="https://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/${mvn.version}/maven-ant-tasks-${mvn.version}.jar"/>
-   <property name="mvn.jar"
-       location="${build.dir}/maven-ant-tasks-${mvn.version}.jar" />
-   <property name="build.ivy.dir" location="${build.dir}/ivy" />
-diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
-index f0383c320..62b034821 100644
---- a/ivy/ivysettings.xml
-+++ b/ivy/ivysettings.xml
-@@ -23,7 +23,7 @@ under the License.
-   see http://www.jayasoft.org/ivy/doc/configuration
-   -->
-   <!-- you can override this property to use mirrors
--          http://repo1.maven.org/maven2/
-+          https://repo1.maven.org/maven2/
-           http://mirrors.dotsrc.org/maven2
-           http://ftp.ggi-project.org/pub/packages/maven2
-           http://mirrors.sunsite.dk/maven2
-@@ -31,7 +31,7 @@ under the License.
-           http://ibiblio.lsu.edu/main/pub/packages/maven2
-           http://www.ibiblio.net/pub/packages/maven2
-   -->
--  <property name="repo.maven.org" value="http://repo1.maven.org/maven2/"
-+  <property name="repo.maven.org" value="https://repo1.maven.org/maven2/"
-       override="false"/>
-   <property name="snapshot.apache.org"
-       value="https://repository.apache.org/content/repositories/snapshots/"
diff --git a/bigtop-packages/src/common/sqoop/patch1-SQOOP-3232.diff b/bigtop-packages/src/common/sqoop/patch1-SQOOP-3232.diff
deleted file mode 100644
index 0cbf6c34..00000000
--- a/bigtop-packages/src/common/sqoop/patch1-SQOOP-3232.diff
+++ /dev/null
@@ -1,615 +0,0 @@
-diff --git a/ivy.xml b/ivy.xml
-index e4b45bfd..263bcc81 100644
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -162,6 +162,15 @@ under the License.
-       <exclude org="org.apache.thrift" module="thrift"/>
-       <exclude org="log4j" module="log4j"/>
-     </dependency>
-+    <dependency org="org.apache.hbase" name="hbase-zookeeper" rev="${hbase.version}" conf="common->default">
-+      <artifact name="hbase-zookeeper" type="jar"/>
-+      <artifact name="hbase-zookeeper" type="jar" ext="jar" m:classifier="tests"/>
-+      <exclude org="com.sun.jersey" module="jersey-core"/>
-+      <exclude org="com.sun.jersey" module="jersey-json"/>
-+      <exclude org="com.sun.jersey" module="jersey-server"/>
-+      <exclude org="org.apache.thrift" module="thrift"/>
-+      <exclude org="log4j" module="log4j"/>
-+    </dependency>
-     <dependency org="org.apache.hbase" name="hbase-hadoop-compat" rev="${hbase.version}" conf="common->default">
-       <artifact name="hbase-hadoop-compat" type="jar"/>
-       <artifact name="hbase-hadoop-compat" type="test-jar" ext="jar" m:classifier="tests"/>
-diff --git a/src/java/org/apache/sqoop/hbase/HBasePutProcessor.java b/src/java/org/apache/sqoop/hbase/HBasePutProcessor.java
-index 032fd38a..cf97b8a6 100644
---- a/src/java/org/apache/sqoop/hbase/HBasePutProcessor.java
-+++ b/src/java/org/apache/sqoop/hbase/HBasePutProcessor.java
-@@ -25,8 +25,11 @@
- import org.apache.commons.logging.LogFactory;
- import org.apache.hadoop.conf.Configurable;
- import org.apache.hadoop.conf.Configuration;
-+import org.apache.hadoop.hbase.TableName;
-+import org.apache.hadoop.hbase.client.BufferedMutator;
-+import org.apache.hadoop.hbase.client.Connection;
-+import org.apache.hadoop.hbase.client.ConnectionFactory;
- import org.apache.hadoop.hbase.client.Delete;
--import org.apache.hadoop.hbase.client.HTable;
- import org.apache.hadoop.hbase.client.Mutation;
- import org.apache.hadoop.hbase.client.Put;
- import org.apache.hadoop.hbase.util.Bytes;
-@@ -84,12 +87,19 @@
-   // into a Put command.
-   private PutTransformer putTransformer;
- 
--  private String tableName;
--  private HTable table;
-+  private Connection hbaseConnection;
-+  private BufferedMutator bufferedMutator;
- 
-   public HBasePutProcessor() {
-   }
- 
-+  HBasePutProcessor(Configuration conf, PutTransformer putTransformer, Connection hbaseConnection, BufferedMutator bufferedMutator) {
-+    this.conf = conf;
-+    this.putTransformer = putTransformer;
-+    this.hbaseConnection = hbaseConnection;
-+    this.bufferedMutator = bufferedMutator;
-+  }
-+
-   @Override
-   @SuppressWarnings("unchecked")
-   public void setConf(Configuration config) {
-@@ -106,15 +116,24 @@ public void setConf(Configuration config) {
-       throw new RuntimeException("Could not instantiate PutTransformer.");
-     }
-     putTransformer.init(conf);
-+    initHBaseMutator();
-+  }
- 
--    this.tableName = conf.get(TABLE_NAME_KEY, null);
-+  private void initHBaseMutator() {
-+    String tableName = conf.get(TABLE_NAME_KEY, null);
-     try {
--      this.table = new HTable(conf, this.tableName);
--    } catch (IOException ioe) {
--      throw new RuntimeException("Could not access HBase table " + tableName,
--          ioe);
-+      hbaseConnection = ConnectionFactory.createConnection(conf);
-+      bufferedMutator = hbaseConnection.getBufferedMutator(TableName.valueOf(tableName));
-+    } catch (IOException e) {
-+      if (hbaseConnection != null) {
-+        try {
-+          hbaseConnection.close();
-+        } catch (IOException connCloseException){
-+          LOG.error("Cannot close HBase connection.", connCloseException);
-+        }
-+      }
-+      throw new RuntimeException("Could not create mutator for HBase table " + tableName, e);
-     }
--    this.table.setAutoFlush(false);
-   }
- 
-   @Override
-@@ -131,38 +150,54 @@ public void accept(FieldMappable record)
-       throws IOException, ProcessingException {
-     Map<String, Object> fields = record.getFieldMap();
-     List<Mutation> mutationList = putTransformer.getMutationCommand(fields);
--    if (null != mutationList) {
--      for (Mutation mutation : mutationList) {
--        if (mutation!=null) {
--            if(mutation instanceof Put) {
--              Put putObject = (Put) mutation;
--              if (putObject.isEmpty()) {
--                LOG.warn("Could not insert row with no columns "
--                      + "for row-key column: " + Bytes.toString(putObject.getRow()));
--                } else {
--                  this.table.put(putObject);
--                }
--              } else if(mutation instanceof Delete) {
--                Delete deleteObject = (Delete) mutation;
--                if (deleteObject.isEmpty()) {
--                  LOG.warn("Could not delete row with no columns "
--                        + "for row-key column: " + Bytes.toString(deleteObject.getRow()));
--                } else {
--                  this.table.delete(deleteObject);
--                }
--            }
--        }
-+    if (mutationList == null) {
-+      return;
-+    }
-+    for (Mutation mutation : mutationList) {
-+      if (!canAccept(mutation)) {
-+        continue;
-+      }
-+      if (!mutation.isEmpty()) {
-+        bufferedMutator.mutate(mutation);
-+      } else {
-+        logEmptyMutation(mutation);
-       }
-     }
-   }
- 
-+  private void logEmptyMutation(Mutation mutation) {
-+    String action = null;
-+    if (mutation instanceof Put) {
-+      action = "insert";
-+    } else if (mutation instanceof Delete) {
-+      action = "delete";
-+    }
-+    LOG.warn("Could not " + action + " row with no columns "
-+        + "for row-key column: " + Bytes.toString(mutation.getRow()));
-+  }
-+
-+  private boolean canAccept(Mutation mutation) {
-+    return mutation != null && (mutation instanceof Put || mutation instanceof Delete);
-+  }
-+
-   @Override
-   /**
-    * Closes the HBase table and commits all pending operations.
-    */
-   public void close() throws IOException {
--    this.table.flushCommits();
--    this.table.close();
-+    try {
-+      bufferedMutator.flush();
-+    } finally {
-+      try {
-+        bufferedMutator.close();
-+      } finally {
-+        try {
-+          hbaseConnection.close();
-+        } catch (IOException e) {
-+          LOG.error("Cannot close HBase connection.", e);
-+        }
-+      }
-+    }
-   }
- 
- }
-diff --git a/src/java/org/apache/sqoop/mapreduce/HBaseBulkImportJob.java b/src/java/org/apache/sqoop/mapreduce/HBaseBulkImportJob.java
-index 2bbfffe0..ed89aeb1 100644
---- a/src/java/org/apache/sqoop/mapreduce/HBaseBulkImportJob.java
-+++ b/src/java/org/apache/sqoop/mapreduce/HBaseBulkImportJob.java
-@@ -26,10 +26,14 @@
- import org.apache.hadoop.fs.FileSystem;
- import org.apache.hadoop.fs.Path;
- import org.apache.hadoop.fs.permission.FsPermission;
--import org.apache.hadoop.hbase.client.HTable;
-+import org.apache.hadoop.hbase.TableName;
-+import org.apache.hadoop.hbase.client.Admin;
-+import org.apache.hadoop.hbase.client.Connection;
-+import org.apache.hadoop.hbase.client.ConnectionFactory;
- import org.apache.hadoop.hbase.client.Put;
-+import org.apache.hadoop.hbase.client.Table;
- import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
--import org.apache.hadoop.hbase.mapreduce.HFileOutputFormat;
-+import org.apache.hadoop.hbase.mapreduce.HFileOutputFormat2;
- import org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles;
- import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil;
- import org.apache.hadoop.mapreduce.Job;
-@@ -50,6 +54,8 @@
-   public static final Log LOG = LogFactory.getLog(
-       HBaseBulkImportJob.class.getName());
- 
-+  private Connection hbaseConnection;
-+
-   public HBaseBulkImportJob(final SqoopOptions opts,
-       final ImportJobContext importContext) {
-     super(opts, importContext);
-@@ -81,8 +87,21 @@ protected void jobSetup(Job job) throws IOException, ImportException {
- 
-     TableMapReduceUtil.addDependencyJars(job.getConfiguration(), Preconditions.class);
-     FileOutputFormat.setOutputPath(job, getContext().getDestination());
--    HTable hTable = new HTable(job.getConfiguration(), options.getHBaseTable());
--    HFileOutputFormat.configureIncrementalLoad(job, hTable);
-+    TableName hbaseTableName = TableName.valueOf(options.getHBaseTable());
-+    hbaseConnection = ConnectionFactory.createConnection(job.getConfiguration());
-+
-+    try (
-+        Table hbaseTable = hbaseConnection.getTable(hbaseTableName)
-+    ) {
-+      HFileOutputFormat2.configureIncrementalLoad(job, hbaseTable, hbaseConnection.getRegionLocator(hbaseTableName));
-+    } catch (IOException | RuntimeException e) {
-+      try {
-+        hbaseConnection.close();
-+      } catch (IOException ioException) {
-+        LOG.error("Cannot close HBase connection.", ioException);
-+      }
-+      throw e;
-+    }
-   }
- 
-   /**
-@@ -99,15 +118,16 @@ protected void completeImport(Job job) throws IOException, ImportException {
-     setPermission(fileSystem, fileSystem.getFileStatus(bulkLoadDir),
-       FsPermission.createImmutable((short) 00777));
- 
--    HTable hTable = new HTable(job.getConfiguration(), options.getHBaseTable());
-+    TableName hbaseTableName = TableName.valueOf(options.getHBaseTable());
- 
-     // Load generated HFiles into table
--    try {
--      LoadIncrementalHFiles loader = new LoadIncrementalHFiles(
--        job.getConfiguration());
--      loader.doBulkLoad(bulkLoadDir, hTable);
--    }
--    catch (Exception e) {
-+    try (
-+        Table hbaseTable = hbaseConnection.getTable(hbaseTableName);
-+        Admin hbaseAdmin = hbaseConnection.getAdmin()
-+    ) {
-+      LoadIncrementalHFiles loader = new LoadIncrementalHFiles(job.getConfiguration());
-+      loader.doBulkLoad(bulkLoadDir, hbaseAdmin, hbaseTable, hbaseConnection.getRegionLocator(hbaseTableName));
-+    } catch (Exception e) {
-       String errorMessage = String.format("Unrecoverable error while " +
-         "performing the bulk load of files in [%s]",
-         bulkLoadDir.toString());
-@@ -117,11 +137,19 @@ protected void completeImport(Job job) throws IOException, ImportException {
- 
-   @Override
-   protected void jobTeardown(Job job) throws IOException, ImportException {
--    super.jobTeardown(job);
--    // Delete the hfiles directory after we are finished.
--    Path destination = getContext().getDestination();
--    FileSystem fileSystem = destination.getFileSystem(job.getConfiguration());
--    fileSystem.delete(destination, true);
-+    try {
-+	    super.jobTeardown(job);
-+      // Delete the hfiles directory after we are finished.
-+      Path destination = getContext().getDestination();
-+      FileSystem fileSystem = destination.getFileSystem(job.getConfiguration());
-+      fileSystem.delete(destination, true);
-+    } finally {
-+      try {
-+        hbaseConnection.close();
-+      } catch (IOException e) {
-+        LOG.error("Cannot close HBase connection.", e);
-+      }
-+    }
-   }
- 
-   /**
-diff --git a/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java b/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
-index 523d0a7e..5adb7883 100644
---- a/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
-+++ b/src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java
-@@ -19,7 +19,6 @@
- package org.apache.sqoop.mapreduce;
- 
- import java.io.IOException;
--import java.lang.reflect.InvocationTargetException;
- import java.lang.reflect.Method;
- 
- import org.apache.commons.logging.Log;
-@@ -28,10 +27,14 @@
- import org.apache.hadoop.hbase.HBaseConfiguration;
- import org.apache.hadoop.hbase.HColumnDescriptor;
- import org.apache.hadoop.hbase.HTableDescriptor;
--import org.apache.hadoop.hbase.client.HBaseAdmin;
--import org.apache.hadoop.hbase.client.HTable;
-+import org.apache.hadoop.hbase.TableName;
-+import org.apache.hadoop.hbase.client.Admin;
-+import org.apache.hadoop.hbase.client.Connection;
-+import org.apache.hadoop.hbase.client.ConnectionFactory;
-+import org.apache.hadoop.hbase.client.Table;
- import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil;
- import org.apache.hadoop.hbase.security.User;
-+import org.apache.hadoop.hbase.security.token.TokenUtil;
- import org.apache.hadoop.hbase.util.Bytes;
- import org.apache.hadoop.io.NullWritable;
- import org.apache.hadoop.mapreduce.Job;
-@@ -160,65 +163,28 @@ protected void jobSetup(Job job) throws IOException, ImportException {
-       HBaseConfiguration.addHbaseResources(conf);
-     }
- 
--    HBaseAdmin admin = new HBaseAdmin(conf);
-+    Connection hbaseConnection = ConnectionFactory.createConnection(conf);
-+    Admin admin = hbaseConnection.getAdmin();
- 
-     if (!skipDelegationTokens(conf)) {
--      // Add authentication token to the job if we're running on secure cluster.
--      //
--      // We're currently supporting HBase version 0.90 that do not have security
--      // patches which means that it do not have required methods
--      // "isSecurityEnabled" and "obtainAuthTokenForJob".
--      //
--      // We're using reflection API to see if those methods are available and call
--      // them only if they are present.
--      //
--      // After we will remove support for HBase 0.90 we can simplify the code to
--      // following code fragment:
--      /*
-       try {
--        if (User.isSecurityEnabled()) {
--          User user = User.getCurrent();
--          user.obtainAuthTokenForJob(conf, job);
-+        if (User.isHBaseSecurityEnabled(conf)) {
-+          TokenUtil.obtainTokenForJob(hbaseConnection, User.getCurrent(), job);
-         }
-       } catch(InterruptedException ex) {
-         throw new ImportException("Can't get authentication token", ex);
-       }
--      */
--      try {
--        // Get method isSecurityEnabled
--        Method isHBaseSecurityEnabled = User.class.getMethod(
--            "isHBaseSecurityEnabled", Configuration.class);
--
--        // Get method obtainAuthTokenForJob
--        Method obtainAuthTokenForJob = User.class.getMethod(
--            "obtainAuthTokenForJob", Configuration.class, Job.class);
--
--        // Get current user
--        User user = User.getCurrent();
--
--        // Obtain security token if needed
--        if ((Boolean)isHBaseSecurityEnabled.invoke(null, conf)) {
--          obtainAuthTokenForJob.invoke(user, conf, job);
--        }
--      } catch (NoSuchMethodException e) {
--        LOG.info("It seems that we're running on HBase without security"
--            + " additions. Security additions will not be used during this job.");
--      } catch (InvocationTargetException e) {
--        throw new ImportException("Can't get authentication token", e);
--      } catch (IllegalAccessException e) {
--        throw new ImportException("Can't get authentication token", e);
--      }
-     }
- 
-     // Check to see if the table exists.
-     HTableDescriptor tableDesc = null;
-     byte [] familyBytes = Bytes.toBytes(familyName);
-     HColumnDescriptor colDesc = new HColumnDescriptor(familyBytes);
--    if (!admin.tableExists(tableName)) {
-+    if (!admin.tableExists(TableName.valueOf(tableName))) {
-       if (options.getCreateHBaseTable()) {
-         // Create the table.
-         LOG.info("Creating missing HBase table " + tableName);
--        tableDesc =  new HTableDescriptor(tableName);
-+        tableDesc =  new HTableDescriptor(TableName.valueOf(tableName));
-         tableDesc.addFamily(colDesc);
-         admin.createTable(tableDesc);
-       } else {
-@@ -228,16 +194,16 @@ protected void jobSetup(Job job) throws IOException, ImportException {
-       }
-     } else {
-       // Table exists, so retrieve their current version
--      tableDesc = admin.getTableDescriptor(Bytes.toBytes(tableName));
-+	    tableDesc = admin.getTableDescriptor(TableName.valueOf(tableName));
- 
-       // Check if current version do have specified column family
-       if (!tableDesc.hasFamily(familyBytes)) {
-         if (options.getCreateHBaseTable()) {
-           // Create the column family.
-           LOG.info("Creating missing column family " + familyName);
--          admin.disableTable(tableName);
--          admin.addColumn(tableName, colDesc);
--          admin.enableTable(tableName);
-+          admin.disableTable(TableName.valueOf(tableName));
-+          admin.addColumn(TableName.valueOf(tableName), colDesc);
-+          admin.enableTable(TableName.valueOf(tableName));
-         } else {
-           LOG.warn("Could not find column family " + familyName + " in table "
-             + tableName);
-@@ -250,10 +216,11 @@ protected void jobSetup(Job job) throws IOException, ImportException {
-     // Make sure we close the connection to HBA, this is only relevant in
-     // unit tests
-     admin.close();
-+    hbaseConnection.close();
- 
-     // Make sure HBase libraries are shipped as part of the job.
-     TableMapReduceUtil.addDependencyJars(job);
--    TableMapReduceUtil.addDependencyJars(conf, HTable.class);
-+    TableMapReduceUtil.addDependencyJars(conf, Table.class);
- 
-     super.jobSetup(job);
-   }
-diff --git a/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java b/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
-index d9f74952..9d365ebb 100644
---- a/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
-+++ b/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
-@@ -38,6 +38,10 @@
- import org.apache.hadoop.hbase.HBaseTestingUtility;
- import org.apache.hadoop.hbase.HConstants;
- import org.apache.hadoop.hbase.MiniHBaseCluster;
-+import org.apache.hadoop.hbase.TableName;
-+import org.apache.hadoop.hbase.client.Connection;
-+import org.apache.hadoop.hbase.client.ConnectionFactory;
-+import org.apache.hadoop.hbase.client.Table;
- import org.apache.hadoop.hbase.client.Get;
- import org.apache.hadoop.hbase.client.HTable;
- import org.apache.hadoop.hbase.client.Result;
-@@ -236,9 +240,10 @@ protected void verifyHBaseCell(String tableName, String rowKey,
-       String colFamily, String colName, String val) throws IOException {
-     Get get = new Get(Bytes.toBytes(rowKey));
-     get.addColumn(Bytes.toBytes(colFamily), Bytes.toBytes(colName));
--    HTable table = new HTable(new Configuration(
--        hbaseTestUtil.getConfiguration()), Bytes.toBytes(tableName));
--    try {
-+    try (
-+        Connection hbaseConnection = createHBaseConnection();
-+        Table table = getHBaseTable(hbaseConnection, tableName)
-+    ) {
-       Result r = table.get(get);
-       byte [] actualVal = r.getValue(Bytes.toBytes(colFamily),
-           Bytes.toBytes(colName));
-@@ -248,8 +253,6 @@ protected void verifyHBaseCell(String tableName, String rowKey,
-         assertNotNull("No result, but we expected one", actualVal);
-         assertEquals(val, Bytes.toString(actualVal));
-       }
--    } finally {
--      table.close();
-     }
-   }
-   public static File createTempDir() {
-@@ -264,18 +267,25 @@ public static File createTempDir() {
-   protected int countHBaseTable(String tableName, String colFamily)
-       throws IOException {
-     int count = 0;
--    HTable table = new HTable(new Configuration(
--        hbaseTestUtil.getConfiguration()), Bytes.toBytes(tableName));
--    try {
-+    try (
-+        Connection hbaseConnection = createHBaseConnection();
-+        Table table = getHBaseTable(hbaseConnection, tableName)
-+    ) {
-       ResultScanner scanner = table.getScanner(Bytes.toBytes(colFamily));
-       for(Result result = scanner.next();
-           result != null;
-           result = scanner.next()) {
-         count++;
-       }
--    } finally {
--      table.close();
-     }
-     return count;
-   }
-+
-+  private Connection createHBaseConnection() throws IOException {
-+    return ConnectionFactory.createConnection(new Configuration(hbaseTestUtil.getConfiguration()));
-+  }
-+
-+  private Table getHBaseTable(Connection connection, String tableName) throws IOException {
-+    return connection.getTable(TableName.valueOf(tableName));
-+  }
- }
-diff --git a/src/test/org/apache/sqoop/hbase/TestHBasePutProcessor.java b/src/test/org/apache/sqoop/hbase/TestHBasePutProcessor.java
-new file mode 100644
-index 00000000..73b31772
---- /dev/null
-+++ b/src/test/org/apache/sqoop/hbase/TestHBasePutProcessor.java
-@@ -0,0 +1,133 @@
-+/**
-+ * 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
-+ * <p>
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ * <p>
-+ * 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.sqoop.hbase;
-+
-+import com.cloudera.sqoop.lib.FieldMappable;
-+import org.apache.hadoop.conf.Configuration;
-+import org.apache.hadoop.hbase.client.BufferedMutator;
-+import org.apache.hadoop.hbase.client.Connection;
-+import org.apache.hadoop.hbase.client.Delete;
-+import org.apache.hadoop.hbase.client.Mutation;
-+import org.apache.hadoop.hbase.client.Put;
-+import org.apache.sqoop.util.ExpectedLogMessage;
-+import org.junit.Before;
-+import org.junit.Rule;
-+import org.junit.Test;
-+
-+import java.util.Arrays;
-+import java.util.List;
-+
-+import static java.util.Collections.singletonList;
-+import static org.mockito.Matchers.anyMap;
-+import static org.mockito.Mockito.mock;
-+import static org.mockito.Mockito.verify;
-+import static org.mockito.Mockito.verifyNoMoreInteractions;
-+import static org.mockito.Mockito.when;
-+
-+public class TestHBasePutProcessor {
-+
-+  @Rule
-+  public ExpectedLogMessage expectedLogMessage = new ExpectedLogMessage();
-+
-+  private Configuration configuration;
-+  private Connection hbaseConnection;
-+  private PutTransformer putTransformer;
-+  private BufferedMutator bufferedMutator;
-+  private FieldMappable fieldMappable;
-+
-+  private HBasePutProcessor hBasePutProcessor;
-+
-+  @Before
-+  public void before() {
-+    configuration = mock(Configuration.class);
-+    hbaseConnection = mock(Connection.class);
-+    putTransformer = mock(PutTransformer.class);
-+    bufferedMutator = mock(BufferedMutator.class);
-+    fieldMappable = mock(FieldMappable.class);
-+
-+    hBasePutProcessor = new HBasePutProcessor(configuration, putTransformer, hbaseConnection, bufferedMutator);
-+  }
-+
-+  @Test
-+  public void testNoMutationIsDoneWhenNullListIsReceived() throws Exception {
-+    when(putTransformer.getMutationCommand(anyMap())).thenReturn(null);
-+    verifyNoMoreInteractions(bufferedMutator);
-+
-+    hBasePutProcessor.accept(fieldMappable);
-+  }
-+
-+  @Test
-+  public void testNoMutationIsDoneWhenListContainingNullsIsReceived() throws Exception {
-+    List<Mutation> inputList = Arrays.asList(null, null, null);
-+    when(putTransformer.getMutationCommand(anyMap())).thenReturn(inputList);
-+    verifyNoMoreInteractions(bufferedMutator);
-+
-+    hBasePutProcessor.accept(fieldMappable);
-+  }
-+
-+  @Test
-+  public void testNoMutationIsDoneWhenListContainingUnknownMutationIsReceived() throws Exception {
-+    List<Mutation> inputList = singletonList(mock(Mutation.class));
-+    when(putTransformer.getMutationCommand(anyMap())).thenReturn(inputList);
-+    verifyNoMoreInteractions(bufferedMutator);
-+
-+    hBasePutProcessor.accept(fieldMappable);
-+  }
-+
-+  @Test
-+  public void testWarningIsLoggedWhenListContainingEmptyPutIsReceived() throws Exception {
-+    Mutation emptyPutMutation = mock(Put.class);
-+    when(emptyPutMutation.getRow()).thenReturn("emptyPutMutation".getBytes());
-+    when(emptyPutMutation.isEmpty()).thenReturn(true);
-+    List<Mutation> inputList = singletonList(emptyPutMutation);
-+    when(putTransformer.getMutationCommand(anyMap())).thenReturn(inputList);
-+    verifyNoMoreInteractions(bufferedMutator);
-+    expectedLogMessage.expectWarn("Could not insert row with no columns for row-key column: emptyPutMutation");
-+
-+    hBasePutProcessor.accept(fieldMappable);
-+  }
-+
-+  @Test
-+  public void testWarningIsLoggedWhenListContainingEmptyDeleteIsReceived() throws Exception {
-+    Mutation emptyDeleteMutation = mock(Delete.class);
-+    when(emptyDeleteMutation.getRow()).thenReturn("emptyDeleteMutation".getBytes());
-+    when(emptyDeleteMutation.isEmpty()).thenReturn(true);
-+    List<Mutation> inputList = singletonList(emptyDeleteMutation);
-+    when(putTransformer.getMutationCommand(anyMap())).thenReturn(inputList);
-+    verifyNoMoreInteractions(bufferedMutator);
-+    expectedLogMessage.expectWarn("Could not delete row with no columns for row-key column: emptyDeleteMutation");
-+
-+    hBasePutProcessor.accept(fieldMappable);
-+  }
-+
-+  @Test
-+  public void testMutationIsDoneForAllElementsWhenListContainingValidMutationsIsReceived() throws Exception {
-+    Mutation aPutMutation = mock(Put.class);
-+    Mutation aDeleteMutation = mock(Delete.class);
-+    Mutation anotherPutMutation = mock(Put.class);
-+    List<Mutation> inputList = Arrays.asList(aPutMutation, aDeleteMutation, anotherPutMutation);
-+    when(putTransformer.getMutationCommand(anyMap())).thenReturn(inputList);
-+
-+    hBasePutProcessor.accept(fieldMappable);
-+
-+    verify(bufferedMutator).mutate(aPutMutation);
-+    verify(bufferedMutator).mutate(aDeleteMutation);
-+    verify(bufferedMutator).mutate(anotherPutMutation);
-+  }
-+
-+}
-\ No newline at end of file
diff --git a/bigtop-packages/src/common/sqoop/patch2-redist-commons-lang.diff b/bigtop-packages/src/common/sqoop/patch2-redist-commons-lang.diff
deleted file mode 100644
index 4eae41eb..00000000
--- a/bigtop-packages/src/common/sqoop/patch2-redist-commons-lang.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/ivy.xml b/ivy.xml
-index e4b45bfd..63cdcce4 100644
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -103,6 +103,8 @@ under the License.
-       conf="common->default;redist->default"/>
-     <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
-       conf="common->default;redist->default"/>
-+    <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"
-+      conf="common->default;redist->default"/>
-     <dependency org="org.apache.commons" name="commons-lang3" rev="${commons-lang3.version}"
-       conf="common->default;redist->default"/>
-     <dependency org="org.kitesdk" name="kite-data-mapreduce" rev="${kite-data.version}"
-@@ -121,8 +123,6 @@ under the License.
-
-     <dependency org="com.google.code.p.arat" name="rat-lib"
-           rev="${rats-lib.version}" conf="releaseaudit->default" />
--    <dependency org="commons-lang" name="commons-lang"
--      rev="${commons-lang.version}" conf="releaseaudit->default"/>
-     <dependency org="commons-collections" name="commons-collections"
-       rev="${commons-collections.version}" conf="releaseaudit->default"/>
diff --git a/bigtop-packages/src/common/sqoop/patch3-hadoop333-denpendency-changes.diff b/bigtop-packages/src/common/sqoop/patch3-hadoop333-denpendency-changes.diff
deleted file mode 100644
index c1a35a1a..00000000
--- a/bigtop-packages/src/common/sqoop/patch3-hadoop333-denpendency-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/ivy.xml b/ivy.xml
-index e4b45bfd..8425bcf5 100644
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -105,6 +105,8 @@ under the License.
-       conf="common->default;redist->default"/>
-     <dependency org="org.apache.commons" name="commons-lang3" rev="${commons-lang3.version}"
-       conf="common->default;redist->default"/>
-+    <dependency org="javax.activation" name="javax.activation-api" rev="${javax-activation-api.version}"
-+      conf="common->default;redist->default"/>
-     <dependency org="org.kitesdk" name="kite-data-mapreduce" rev="${kite-data.version}"
-       conf="common->default;redist->default">
-       <exclude org="org.apache.avro" module="avro" />
-diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
-index f0383c32..b9994c18 100644
---- a/ivy/ivysettings.xml
-+++ b/ivy/ivysettings.xml
-@@ -47,6 +47,7 @@ under the License.
-       override="false"/>
-   <property name="maven2.pattern"
-       value="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier])"/>
-+  <property name="packaging.type" value="jar"/>
-   <property name="repo.dir" value="${user.home}/.m2/repository"/>
-   <property name="ivy.cache.dir" value="${user.home}/.ivy2/cache"/>
-   <property name="maven2.pattern.ext"  value="${maven2.pattern}.[ext]"/>
-diff --git a/ivy/libraries.properties b/ivy/libraries.properties
-index 2ef04f4f..db6dd61c 100644
---- a/ivy/libraries.properties
-+++ b/ivy/libraries.properties
-@@ -31,10 +31,11 @@ commons-lang.version=2.4
- commons-lang3.version=3.4
- commons-logging.version=1.0.4
- commons-net.version=3.1
-+javax-activation-api.version=1.2.0
- 
- hsqldb.version=1.8.0.10
- 
--ivy.version=2.3.0
-+ivy.version=2.5.0
- 
- junit.version=4.12
- mockito-all.version=1.9.5
diff --git a/bigtop-packages/src/common/sqoop/sqoop-metastore.sh b/bigtop-packages/src/common/sqoop/sqoop-metastore.sh
deleted file mode 100644
index 0b129e6b..00000000
--- a/bigtop-packages/src/common/sqoop/sqoop-metastore.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-# chkconfig: 2345 90 10
-# description: Sqoop allows easy imports and exports of data sets between \
-# databases and the Hadoop Distributed File System (HDFS). The Sqoop \
-# metastore allows users to define saved jobs for repeated execution and \
-# share them with other users of the cluster.
-# processname: java
-# pidfile: /var/run/sqoop/sqoop-metastore.pid
-### BEGIN INIT INFO
-# Provides:          Sqoop
-# Required-Start:    $network $local_fs $remote_fs
-# Required-Stop:     $remote_fs
-# Should-Start:      $named
-# Should-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).
-### END INIT INFO
-set -e
-
-# Autodetect JAVA_HOME if not defined
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
-
-BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hadoop ] && . ${BIGTOP_DEFAULTS_DIR}/hadoop
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-NAME=sqoop-metastore
-DESC="Sqoop metastore"
-PID_FILE=/var/run/sqoop/sqoop-metastore.pid
-LOGDIR=/var/log/sqoop
-
-DODTIME=3
-
-# Returns 0 if pid is alive, 1 if not.
-hadoop_is_process_alive() {
-  local pid="$1"
-  ps -fp $pid | grep $pid | grep sqoop > /dev/null 2>&1
-}
-
-hadoop_check_pidfile() {
-    local pidfile="$1" # IN
-    local pid
-
-    pid=`cat "$pidfile" 2>/dev/null`
-    if [ "$pid" = '' ]; then
-    # The file probably does not exist or is empty. 
-    return 1
-    fi
-    
-    set -- $pid
-    pid="$1"
-
-    hadoop_is_process_alive $pid
-}
-
-hadoop_process_kill() {
-    local pid="$1"    # IN
-    local signal="$2" # IN
-    local second
-
-    kill -$signal $pid 2>/dev/null
-
-   # Wait a bit to see if the dirty job has really been done
-    for second in {0..10}; do
-    if hadoop_is_process_alive "$pid"; then
-         # Success
-        return 0
-    fi
-
-    sleep 1
-    done
-
-   # Timeout
-    return 1
-}
-hadoop_stop_pidfile() {
-    local pidfile="$1" # IN
-    local pid
-
-    pid=`cat "$pidfile" 2>/dev/null`
-    if [ "$pid" = '' ]; then
-      # The file probably does not exist or is empty. Success
-    return 0
-    fi
-    
-    set -- $pid
-    pid="$1"
-
-   # First try the easy way
-    if hadoop_process_kill "$pid" 15; then
-    return 0
-    fi
-
-   # Otherwise try the hard way
-    if hadoop_process_kill "$pid" 9; then
-    return 0
-    fi
-
-    return 1
-}
-
-
-start() {
-    # Pid files created in sqoop-specific directory under /var/run.
-    # The dir should be recreated first.
-    local piddir=`dirname "$PID_FILE"`
-    install -d -m 0755 -o sqoop -g sqoop "$piddir"
-    runuser -s /bin/bash sqoop -c \
-         "/usr/lib/sqoop/bin/start-metastore.sh -p $PID_FILE -l $LOGDIR"
-}
-stop() {
-    runuser -s /bin/bash sqoop -c \
-        "/usr/lib/sqoop/bin/stop-metastore.sh -p $PID_FILE"
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    force-stop)
-        echo -n "Forcefully stopping $DESC: "
-        hadoop_stop_pidfile $PID_FILE
-        if ! hadoop_check_pidfile $PID_FILE ; then
-            echo "$NAME."
-        else
-            echo "ERROR."
-        fi
-        rm $PID_FILE
-        ;;
-    force-reload|condrestart|try-restart)
-        # check whether $DAEMON is running. If so, restart
-        hadoop_check_pidfile $PID_FILE && $0 restart
-        ;;
-    restart|reload)
-        echo -n "Restarting $DESC: "
-        stop
-        [ -n "$DODTIME" ] && sleep $DODTIME
-        $0 start
-        ;;
-    status)
-        echo -n "$NAME is "
-        if hadoop_check_pidfile $PID_FILE ;  then
-            echo "running"
-        else
-            echo "not running."
-            exit 1
-        fi
-        ;;
-
-    *)
-        N=/etc/init.d/$NAME
-        echo "Usage: $N {start|stop|restart|force-reload|status|force-stop|condrestart|try-restart}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse b/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse
deleted file mode 100644
index 82b05df3..00000000
--- a/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-# Starts a Sqoop metastore 
-#
-# chkconfig: 2345 90 10
-# description: Sqoop allows easy imports and exports of data sets between \
-# databases and the Hadoop Distributed File System (HDFS). The Sqoop \
-# metastore allows users to define saved jobs for repeated execution and \
-# share them with other users of the cluster.
-# processname: java
-#
-### BEGIN INIT INFO
-# Provides:          Sqoop
-# Required-Start:    $network $local_fs $remote_fs
-# Required-Stop:     $remote_fs
-# Should-Start:      $named
-# Should-Stop:
-# Default-Start:     3 4 5
-# Default-Stop:      0 1 2 6
-# Short-Description: Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-# Autodetect JAVA_HOME if not defined
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
-
-BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hadoop ] && . ${BIGTOP_DEFAULTS_DIR}/hadoop
-
-STATUS_RUNNING=0
-STATUS_DEAD=1
-STATUS_DEAD_AND_LOCK=2
-STATUS_NOT_RUNNING=3
-
-ERROR_PROGRAM_NOT_INSTALLED=5
-ERROR_PROGRAM_NOT_CONFIGURED=6
-
-
-RETVAL=0
-NAME=sqoop-metastore
-DESC="Sqoop metastore"
-PID_FILE=/var/run/sqoop/sqoop-metastore.pid
-LOCKFILE="/var/lock/subsys/sqoop-metastore"
-LOGDIR=/var/log/sqoop
-SQOOP_BIN_PATH="/usr/lib/sqoop/bin"
-USER="sqoop"
-GROUP="sqoop"
-
-start() {
-  [ -x ${SQOOP_BIN_PATH}/start-metastore.sh ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-
-  # Pid files created in sqoop-specific directory under /var/run.
-  # The dir should be recreated first.
-  local piddir=`dirname "$PID_FILE"`
-  install -d -m 0755 -o $USER -g $GROUP "$piddir"
-
-  log_success_msg "Starting $DESC: "
-  start_daemon -u $USER ${SQOOP_BIN_PATH}/start-metastore.sh -p $PID_FILE -l $LOGDIR
-  RETVAL=$?
-  echo
-  [ $RETVAL -eq 0 ] && touch $LOCKFILE
-  return $RETVAL
-}
-
-stop() {
-  [ -x ${SQOOP_BIN_PATH}/stop-metastore.sh ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-  log_success_msg "Stopping $DESC: "
-  start_daemon -u $USER ${SQOOP_BIN_PATH}/stop-metastore.sh -p $PID_FILE
-  RETVAL=$?
-  sleep 5
-  echo
-  [ $RETVAL -eq 0 ] && rm -f $LOCKFILE $PIDFILE
-}
-
-restart() {
-  stop
-  start
-}
-
-checkstatus(){
-  pidofproc -p $PID_FILE java > /dev/null
-  status=$?
-
-  case "$status" in
-    $STATUS_RUNNING)
-      log_success_msg "$DESC is running"
-      ;;
-    $STATUS_DEAD)
-      log_failure_msg "$DESC is dead and pid file exists"
-      ;;
-    $STATUS_DEAD_AND_LOCK)
-      log_failure_msg "$DESC is dead and lock file exists"
-      ;;
-    $STATUS_NOT_RUNNING)
-      log_failure_msg "$DESC is not running"
-      ;;
-    *)
-      log_failure_msg "$DESC status is unknown"
-      ;;
-  esac
-  return $status
-}
-
-condrestart(){
-  [ -e $LOCKFILE ] && restart || :
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  status)
-    checkstatus
-    ;;
-  restart)
-    restart
-    ;;
-  condrestart|try-restart)
-    condrestart
-    ;;
-  *)
-    echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart}"
-    exit 1
-esac
-
-exit $RETVAL
diff --git a/bigtop-packages/src/deb/oozie/control b/bigtop-packages/src/deb/oozie/control
index ca65302f..dbafd932 100644
--- a/bigtop-packages/src/deb/oozie/control
+++ b/bigtop-packages/src/deb/oozie/control
@@ -46,7 +46,7 @@ Description: Oozie is a system that runs workflows of Hadoop jobs.
  .
  An Oozie workflow may contain the following types of actions nodes:
  map-reduce, map-reduce streaming, map-reduce pipes, pig, file-system,
- sub-workflows, java, hive, sqoop and ssh (deprecated).
+ sub-workflows, java, hive, and ssh (deprecated).
  .
  Flow control operations within the workflow can be done using decision,
  fork and join nodes. Cycles in workflows are not supported.
diff --git a/bigtop-packages/src/deb/sqoop/changelog b/bigtop-packages/src/deb/sqoop/changelog
deleted file mode 100644
index 547ed021..00000000
--- a/bigtop-packages/src/deb/sqoop/changelog
+++ /dev/null
@@ -1 +0,0 @@
---- This is auto-generated 
diff --git a/bigtop-packages/src/deb/sqoop/compat b/bigtop-packages/src/deb/sqoop/compat
deleted file mode 100644
index 7f8f011e..00000000
--- a/bigtop-packages/src/deb/sqoop/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/bigtop-packages/src/deb/sqoop/control b/bigtop-packages/src/deb/sqoop/control
deleted file mode 100644
index eec2495a..00000000
--- a/bigtop-packages/src/deb/sqoop/control
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.
-Source: sqoop
-Section: misc
-Priority: extra
-Maintainer: Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~), asciidoc, xmlto
-Standards-Version: 3.8.0
-Homepage: http://sqoop.apache.org/
-
-Package:  sqoop
-Architecture: all
-Depends: bigtop-utils (>= 0.7), hadoop-client, adduser
-Description: Tool for easy imports and exports of data sets between databases and HDFS
- Sqoop is a tool that provides the ability to import and export data sets between
- the Hadoop Distributed File System (HDFS) and relational databases.
-
-Package: sqoop-metastore
-Architecture: all
-Depends: sqoop (= ${source:Version})
-Description: Shared metadata repository for Sqoop.
- This optional package hosts a metadata server for Sqoop clients across a network to use.
-
diff --git a/bigtop-packages/src/deb/sqoop/copyright b/bigtop-packages/src/deb/sqoop/copyright
deleted file mode 100644
index ae4dba6a..00000000
--- a/bigtop-packages/src/deb/sqoop/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: http://sqoop.apache.org/
-Upstream-Name: Sqoop
-
-Files *
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-Files debian/*
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the complete text of the Apache 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/bigtop-packages/src/deb/sqoop/rules b/bigtop-packages/src/deb/sqoop/rules
deleted file mode 100755
index 007ec2bb..00000000
--- a/bigtop-packages/src/deb/sqoop/rules
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-#
-# 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.
-
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	bash debian/do-component-build
-
-override_dh_auto_install:
-	bash -x debian/install_sqoop.sh \
-	  --build-dir=build/sqoop-* \
-	  --doc-dir=usr/share/doc/sqoop \
-	  --conf-dir=/etc/sqoop/conf.dist \
-	  --prefix=debian/sqoop \
-	  --extra-dir=debian/
-	cp debian/sqoop-metastore.sh debian/sqoop-metastore.init
diff --git a/bigtop-packages/src/deb/sqoop/source/format b/bigtop-packages/src/deb/sqoop/source/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/bigtop-packages/src/deb/sqoop/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/deb/sqoop/sqoop-metastore.postinst b/bigtop-packages/src/deb/sqoop/sqoop-metastore.postinst
deleted file mode 100644
index 6d84e19d..00000000
--- a/bigtop-packages/src/deb/sqoop/sqoop-metastore.postinst
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-# postinst script for sqoop
-
-set -e
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
diff --git a/bigtop-packages/src/deb/sqoop/sqoop.postinst b/bigtop-packages/src/deb/sqoop/sqoop.postinst
deleted file mode 100644
index ac850025..00000000
--- a/bigtop-packages/src/deb/sqoop/sqoop.postinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# 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.
-
-# postinst script for sqoop 
-
-set -e
-
-case "$1" in
-    configure)
-        # Install config alternatives
-        update-alternatives  --install /etc/sqoop/conf sqoop-conf /etc/sqoop/conf.dist 30
-
-        chown sqoop:sqoop /var/lib/sqoop
-        chmod 755 /var/lib/sqoop
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
diff --git a/bigtop-packages/src/deb/sqoop/sqoop.preinst b/bigtop-packages/src/deb/sqoop/sqoop.preinst
deleted file mode 100644
index 1477d5cb..00000000
--- a/bigtop-packages/src/deb/sqoop/sqoop.preinst
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# 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.
-
-# preinst script for sqoop
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-        getent group sqoop >/dev/null || groupadd -r sqoop
-        if ! getent passwd sqoop >/dev/null; then
-                # Adding system user: sqoop .
-                adduser \
-                  --system \
-                  --ingroup sqoop \
-                  --home /var/lib/sqoop \
-                  --gecos "Sqoop User" \
-                  --shell /bin/false \
-                  sqoop >/dev/null
-        fi
-	install -d -m 0755 -o sqoop -g sqoop /var/lib/sqoop
-	install -d -m 0755 -o sqoop -g sqoop /var/log/sqoop
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/sqoop/sqoop.prerm b/bigtop-packages/src/deb/sqoop/sqoop.prerm
deleted file mode 100644
index 5ee82f2b..00000000
--- a/bigtop-packages/src/deb/sqoop/sqoop.prerm
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-# prerm script for sqoop 
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-      update-alternatives --remove sqoop-conf /etc/sqoop/conf.dist || :
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
index 1205f196..91b8799c 100644
--- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
+++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
@@ -80,7 +80,7 @@ BuildArch: noarch
 
  An Oozie workflow may contain the following types of actions nodes:
  map-reduce, map-reduce streaming, map-reduce pipes, pig, file-system,
- sub-workflows, java, hive, sqoop and ssh (deprecated).
+ sub-workflows, java, hive and ssh (deprecated).
 
  Flow control operations within the workflow can be done using decision,
  fork and join nodes. Cycles in workflows are not supported.
diff --git a/bigtop-packages/src/rpm/sqoop/BUILD/.gitignore b/bigtop-packages/src/rpm/sqoop/BUILD/.gitignore
deleted file mode 100644
index 139597f9..00000000
--- a/bigtop-packages/src/rpm/sqoop/BUILD/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/bigtop-packages/src/rpm/sqoop/RPMS/.gitignore b/bigtop-packages/src/rpm/sqoop/RPMS/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/bigtop-packages/src/rpm/sqoop/SOURCES/.gitignore b/bigtop-packages/src/rpm/sqoop/SOURCES/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
deleted file mode 100644
index 134ebd74..00000000
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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.
-%define lib_sqoop /usr/lib/sqoop
-%define conf_sqoop %{_sysconfdir}/%{name}/conf
-%define conf_sqoop_dist %{conf_sqoop}.dist
-
-
-%if  %{?suse_version:1}0
-
-# Only tested on openSUSE 11.4. le'ts update it for previous release when confirmed
-%if 0%{suse_version} > 1130
-%define suse_check \# Define an empty suse_check for compatibility with older sles
-%endif
-
-# SLES is more strict anc check all symlinks point to valid path
-# But we do point to a conf which is not there at build time
-# (but would be at install time).
-# Since our package build system does not handle dependencies,
-# these symlink checks are deactivated
-%define __os_install_post \
-    %{suse_check} ; \
-    /usr/lib/rpm/brp-compress ; \
-    %{nil}
-
-%define doc_sqoop %{_docdir}/sqoop
-%global initd_dir %{_sysconfdir}/rc.d
-%define alternatives_cmd update-alternatives
-
-%else
-
-%define doc_sqoop %{_docdir}/sqoop-%{sqoop_version}
-%global initd_dir %{_sysconfdir}/rc.d/init.d
-%define alternatives_cmd alternatives
-
-%endif
-
-
-Name: sqoop
-Version: %{sqoop_version}
-Release: %{sqoop_release}
-Summary:   Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).
-URL: http://sqoop.apache.org/
-Group: Development/Libraries
-Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
-License: ASL 2.0
-Source0: %{name}-%{sqoop_base_version}.tar.gz
-Source1: do-component-build
-Source2: install_%{name}.sh
-Source3: sqoop-metastore.sh
-Source4: sqoop-metastore.sh.suse
-#BIGTOP_PATCH_FILES
-Buildarch: noarch
-BuildRequires: asciidoc, xmlto
-Requires: hadoop-client, bigtop-utils >= 0.7
-
-%description 
-Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).
-
-%package metastore
-Summary: Shared metadata repository for Sqoop.
-URL: http://sqoop.apache.org/
-Group: System/Daemons
-Provides: sqoop-metastore
-Requires: sqoop = %{version}-%{release} 
-
-%if  %{?suse_version:1}0
-# Required for init scripts
-Requires: insserv
-%endif
-
-%if  0%{?mgaversion}
-# Required for init scripts
-Requires: initscripts
-%endif
-
-# CentOS 5 does not have any dist macro
-# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
-%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
-# Required for init scripts
-Requires: redhat-lsb
-%endif
-
-
-%description metastore
-Shared metadata repository for Sqoop. This optional package hosts a metadata
-server for Sqoop clients across a network to use.
-
-%prep
-%setup -n %{name}-%{sqoop_base_version}
-#BIGTOP_PATCH_COMMANDS
-
-%build
-bash %{SOURCE1} -Dversion=%{sqoop_base_version}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-bash %{SOURCE2} \
-          --build-dir=build/sqoop-%{sqoop_base_version}.bin__hadoop-* \
-          --conf-dir=%{conf_sqoop_dist} \
-          --doc-dir=%{doc_sqoop} \
-          --prefix=$RPM_BUILD_ROOT
-
-%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
-%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
-
-%__rm -f $RPM_BUILD_ROOT/%{lib_sqoop}/lib/hadoop-mrunit*.jar
-
-%if  %{?suse_version:1}0
-orig_init_file=$RPM_SOURCE_DIR/sqoop-metastore.sh.suse
-%else
-orig_init_file=$RPM_SOURCE_DIR/sqoop-metastore.sh
-%endif
-
-init_file=$RPM_BUILD_ROOT/%{initd_dir}/sqoop-metastore
-%__cp $orig_init_file $init_file
-chmod 0755 $init_file
-
-%__install -d  -m 0755 $RPM_BUILD_ROOT/var/log/sqoop
-
-%pre
-getent group sqoop >/dev/null || groupadd -r sqoop
-getent passwd sqoop > /dev/null || useradd -c "Sqoop" -s /sbin/nologin \
-	-g sqoop -r -d /var/lib/sqoop sqoop 2> /dev/null || :
-
-%post
-%{alternatives_cmd} --install %{conf_sqoop} %{name}-conf %{conf_sqoop_dist} 30
-
-%preun
-if [ "$1" = 0 ]; then
-  %{alternatives_cmd} --remove %{name}-conf %{conf_sqoop_dist} || :
-fi
-
-%post metastore
-chkconfig --add sqoop-metastore
-
-%preun metastore
-if [ $1 = 0 ] ; then
-  service sqoop-metastore stop > /dev/null 2>&1
-  chkconfig --del sqoop-metastore
-fi
-
-%postun metastore
-if [ $1 -ge 1 ]; then
-  service sqoop-metastore condrestart > /dev/null 2>&1
-fi
-
-%files metastore
-%attr(0755,root,root) %{initd_dir}/sqoop-metastore
-%attr(0755,sqoop,sqoop) /var/lib/sqoop
-%attr(0755,sqoop,sqoop) /var/log/sqoop
-
-# Files for main package
-%files 
-%defattr(0755,root,root)
-%{lib_sqoop}
-%attr(0644,root,root) %{lib_sqoop}/*.jar
-%config(noreplace) %{conf_sqoop_dist}
-%{_bindir}/sqoop
-%{_bindir}/sqoop-codegen
-%{_bindir}/sqoop-create-hive-table
-%{_bindir}/sqoop-eval
-%{_bindir}/sqoop-export
-%{_bindir}/sqoop-help
-%{_bindir}/sqoop-import
-%{_bindir}/sqoop-import-all-tables
-%{_bindir}/sqoop-job
-%{_bindir}/sqoop-list-databases
-%{_bindir}/sqoop-list-tables
-%{_bindir}/sqoop-metastore
-%{_bindir}/sqoop-version
-%{_bindir}/sqoop-merge
-
-%defattr(0644,root,root,0755)
-%{_mandir}/man1/*
-%doc %{doc_sqoop}
-
diff --git a/bigtop-packages/src/rpm/sqoop/SRPMS/.gitignore b/bigtop-packages/src/rpm/sqoop/SRPMS/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/bigtop-tests/smoke-tests/README b/bigtop-tests/smoke-tests/README
index 5e8bd6a7..3303d87f 100644
--- a/bigtop-tests/smoke-tests/README
+++ b/bigtop-tests/smoke-tests/README
@@ -91,6 +91,5 @@ So, below, we've accumulated some typical modifications which you can easily imp
 when running tests through this gradle interface (rather than as jars).
 
 1) Add new tests to hive , other than the "basic" hive test.
-2) Modify the Sqoop test to write more data via the embedded database.
-3) Add your own custom Groovy test in a directory which calls a shell script of your own desgn.
+2) Add your own custom Groovy test in a directory which calls a shell script of your own desgn.
 And so on.
diff --git a/bigtop-tests/smoke-tests/sqoop/TestSqoopETLHsql.groovy b/bigtop-tests/smoke-tests/sqoop/TestSqoopETLHsql.groovy
deleted file mode 100644
index c44e1c86..00000000
--- a/bigtop-tests/smoke-tests/sqoop/TestSqoopETLHsql.groovy
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.bigtop.itest.sqoop
-
-import org.junit.Assert
-import org.junit.BeforeClass
-import org.junit.AfterClass
-import static org.junit.Assert.assertNotNull
-import org.apache.bigtop.itest.shell.Shell
-import static org.junit.Assert.assertTrue
-import org.junit.Test
-import org.apache.hadoop.conf.Configuration
-import org.apache.bigtop.itest.JarContent
-import org.apache.bigtop.itest.TestUtils
-import org.apache.commons.logging.LogFactory
-import org.apache.commons.logging.Log
-import java.lang.reflect.Constructor;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import org.hsqldb.Server;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import org.junit.runner.RunWith
-import org.hsqldb.persist.HsqlDatabaseProperties;
-import org.hsqldb.persist.HsqlProperties;
-import java.sql.DriverManager;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.io.PrintWriter;
-
-class TestSqoopHSQLDBETL {
-  static private Log LOG = LogFactory.getLog(Object.class);
-
-  static Shell sh = new Shell("/bin/bash -s");
-  static final String hsql = "/usr/lib/sqoop/lib/hsqldb-1.8.0.10.jar"
-  static final String port = System.getProperty("port", "9001");
-
-
-  @AfterClass
-  public static void tearDown() {
-    //sh.exec("hadoop fs -rmr -skipTrash pigsmoketest");
-    server.stop();
-  }
-
-  static Server server;
-
-  @BeforeClass
-  static void setUp() {
-    sh.exec("rm -rf /tmp/sqooptest*")
-    HsqlProperties p = new HsqlProperties();
-    p.setProperty("server.database.0", "file:/tmp/sqooptest");
-    // just use default.
-    p.setProperty("server.dbname.0", "sqooptest");
-    p.setProperty("hsqldb.default_table_type", "TEXT");
-    p.setProperty("server.port", port);
-
-    server = new Server();
-    server.setProperties(p);
-    server.setLogWriter(new PrintWriter(System.out, true));
-    // can use custom writer
-    server.setErrWriter(new PrintWriter(System.out, true));
-    // can use custom writer
-    server.start();
-
-  }
-
-  final static String DB_DRIVER = "org.hsqldb.jdbcDriver";
-  static String DB_CONNECTION =
-      "jdbc:hsqldb:hsql://localhost:$port/sqooptest";
-  static String DB_USER = "sa";
-  static String DB_PASSWORD = "";
-
-
-  void execDB(String query) {
-    Connection dbConnection = null;
-    Statement statement = null;
-    try {
-      dbConnection = getDBConnection();
-      statement = dbConnection.createStatement();
-      statement.execute(query);
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-      Assert.fail(e.getMessage() + "")
-    }
-    finally {
-      if (statement != null) statement.close();
-      if (dbConnection != null) dbConnection.close();
-    }
-
-  }
-
-
-  @Test
-  void test() {
-    createDB()
-    sh.exec("sqoop import --libjars /usr/lib/sqoop/lib/hsqldb-1.8.0.10.jar --connect \"jdbc:hsqldb:hsql://localhost:$port/sqooptest\" --username \"SA\" --query \'select ANIMALS.* from ANIMALS WHERE \$CONDITIONS\' --split-by ANIMALS.id --target-dir /tmp/sqooptest")
-  }
-
-  void createDB() {
-    String createTableSQL =
-        """
-        CREATE TABLE ANIMALS(
-         NAME VARCHAR(20) NOT NULL,
-         COUNTRY VARCHAR(20) NOT NULL,
-         ID INTEGER NOT NULL)
-	"""
-
-    execDB(createTableSQL);
-    LOG.info("DONE CREATING ANIMALS DB")
-
-    for (i in 1..300) {
-      execDB("INSERT INTO ANIMALS (NAME,COUNTRY,ID) VALUES (\'ELEPHANT\',\'SOUTH AFRICA\',1)");
-    }
-    execDB("INSERT INTO ANIMALS (NAME,COUNTRY,ID) VALUES (\'ELEPHANT\',\'SOUTH AFRICA\',1)");
-    execDB("INSERT INTO ANIMALS (NAME,COUNTRY,ID) VALUES (\'KOALA\', \'AUSTRALIA\', 2)");
-    execDB("INSERT INTO ANIMALS (NAME,COUNTRY,ID) VALUES (\'ZEBRA\', \'USA\', 3)");
-
-    LOG.info("DONE inserting 3 animals");
-  }
-
-  private static Connection getDBConnection() {
-    Connection dbConnection = null;
-    try {
-      Class.forName(DB_DRIVER);
-    }
-    catch (ClassNotFoundException e) {
-      LOG.info(e.getMessage());
-      Assert.fail("Driver not found ${DB_DRIVER}")
-    }
-    try {
-      dbConnection = DriverManager.
-          getConnection(DB_CONNECTION, DB_USER, DB_PASSWORD);
-      return dbConnection;
-    }
-    catch (Exception e) {
-      Assert.fail("Couldnt get connection ")
-    }
-    return dbConnection;
-  }
-}
diff --git a/bigtop-tests/smoke-tests/sqoop/build.gradle b/bigtop-tests/smoke-tests/sqoop/build.gradle
deleted file mode 100644
index 2202c222..00000000
--- a/bigtop-tests/smoke-tests/sqoop/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-dependencies {
-  testCompile group: 'org.hsqldb', name: 'hsqldb', version: '1.8.0.10'
-}
-
-def tests_to_include() {
-  return [
-      "TestSqoopETLHsql.groovy"
-  ];
-}
-
-sourceSets {
-  test {
-    groovy {
-      srcDirs = ["./"]
-      exclude { FileTreeElement elem -> (doExclude(elem.getName())) }
-    }
-  }
-}
-
-test.doFirst {
-  checkEnv(["SQOOP_HOME"])
-}
diff --git a/bigtop-tests/smoke-tests/sqoop/log4j.properties b/bigtop-tests/smoke-tests/sqoop/log4j.properties
deleted file mode 100644
index db5aacfd..00000000
--- a/bigtop-tests/smoke-tests/sqoop/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=TRACE, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [BIGTOP-TEST-LOG %t] %-5p %c %x --- %m%n
diff --git a/bigtop-tests/test-artifacts/fatjar/pom.xml b/bigtop-tests/test-artifacts/fatjar/pom.xml
index 948c3237..7e21b7b5 100644
--- a/bigtop-tests/test-artifacts/fatjar/pom.xml
+++ b/bigtop-tests/test-artifacts/fatjar/pom.xml
@@ -61,12 +61,6 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.bigtop.itest</groupId>
-      <artifactId>sqoop-smoke</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.bigtop.itest</groupId>
       <artifactId>io-longevity</artifactId>
diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy
index 207bfb02..5efb2114 100644
--- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy
+++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy
@@ -21,7 +21,7 @@ package org.apache.bigtop.itest.packagesmoke
 import org.apache.bigtop.itest.pmanager.PackageManager
 
 class BTServices {
-  static final List serviceDaemonUserNames = ["hbase", "hdfs", "hue", "mapred", "oozie", "sqoop",
+  static final List serviceDaemonUserNames = ["hbase", "hdfs", "hue", "mapred", "oozie",
     "zookeeper", "hadoop"];
 
   static final Map components = [
@@ -54,11 +54,6 @@ class BTServices {
       killIDs: ["hdfs", "mapred", "oozie"],
       verifier: new StateVerifierOozie(),
     ],
-    sqoop: [services: ["hadoop-namenode", "hadoop-datanode",
-      "sqoop-metastore"],
-      killIDs: ["hdfs", "sqoop"],
-      verifier: new StateVerifierSqoop(),
-    ],
     hue: [services: ["hadoop-namenode", "hadoop-datanode", "hadoop-jobtracker", "hadoop-tasktracker",
       "hue"],
       killIDs: ["hdfs", "mapred", "hue"],
diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierSqoop.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierSqoop.groovy
deleted file mode 100644
index 834bf5d1..00000000
--- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierSqoop.groovy
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.bigtop.itest.packagesmoke
-
-import org.apache.bigtop.itest.shell.Shell
-import java.security.MessageDigest
-import org.junit.Test
-
-class StateVerifierSqoop extends StateVerifier {
-  final static String jobSpec = "-- import-all-tables --connect jdbc:mysql://example.com/db";
-  final static String remoteOpt = "--meta-connect 'jdbc:hsqldb:hsql://localhost:16000/sqoop'";
-  Shell sh = new Shell();
-
-  public void createState() {
-    sh.exec("sqoop job              --create localJob ${jobSpec}");
-    sh.exec("sqoop job ${remoteOpt} --create storeJob ${jobSpec}");
-  }
-
-  public boolean verifyState() {
-    boolean localFound = (sh.exec("sqoop job              --show localJob | grep -q '^Job: localJob'").getRet() == 0);
-    boolean storeFound = (sh.exec("sqoop job ${remoteOpt} --show storeJob | grep -q '^Job: storeJob'").getRet() == 0);
-    return (localFound && storeFound);
-  }
-}
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
index 095e9d84..40b0179e 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
@@ -71,27 +71,6 @@
       </hive-webhcat-server>
     </services>
   </hive-webhcat-server>
-  <sqoop>
-    <users>
-      <sqoop>
-        <home>/var/run/sqoop</home>
-        <descr>Sqoop User</descr>
-        <shell>/bin/false</shell>
-      </sqoop>
-    </users>
-  </sqoop>
-  <sqoop-server>
-    <services>
-      <sqoop-server>
-        <runlevel>2</runlevel>
-        <runlevel>3</runlevel>
-        <runlevel>4</runlevel>
-        <runlevel>5</runlevel>
-        <oninstall>start</oninstall>
-        <configured>true</configured>
-      </sqoop-server>
-    </services>
-  </sqoop-server>
   <zookeeper>
     <users>
       <zookeeper>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml b/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml
deleted file mode 100644
index 789a7993..00000000
--- a/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<sqoop>
-  <content>
-    <file name='/.' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-server' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-list-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-export' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-help' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-list-databases' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-job' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-import-all-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/sqoop-test-1.4.1-incubating.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/start-metastore.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-list-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-export' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-help' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-list-databases' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-job' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-import-all-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/stop-metastore.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/configure-sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jackson-mapper-asl-1.7.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-mapred-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/paranamer-2.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/ant-eclipse-1.0-jvm1.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-ipc-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jackson-core-asl-1.7.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/commons-io-1.4.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jopt-simple-3.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/ant-contrib-1.0b3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/snappy-java-1.0.3.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/sqoop-1.4.1-incubating.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/index.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/SqoopDevGuide.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/warning.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/important.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/next.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/6.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/3.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/10.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/9.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/1.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/15.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/13.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/7.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/2.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/14.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/4.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/5.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/11.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/12.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/callouts/8.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/prev.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/caution.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/note.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/README' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/home.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/up.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/tip.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/images/example.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/changelog.Debian.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/sqoop-1.4.1-incubating.releasenotes.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/overview-tree.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/index.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/overview-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/constant-values.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/com' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/index-all.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/allclasses-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/stylesheet.css' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/allclasses-noframe.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/help-doc.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/FieldMappable.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/LobSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/ClobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/RecordParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/FieldMapProcessor.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/BlobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/ProcessingException.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/DelimiterSet.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/package-tree.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/JdbcWritableBridge.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/BooleanParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/package-use.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/RecordParser.ParseError.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/FieldFormatter.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/LargeObjectLoader.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/package-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/BigDecimalSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/FieldMappable.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/LobSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/ClobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/RecordParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/FieldMapProcessor.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/BlobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/ProcessingException.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/DelimiterSet.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/JdbcWritableBridge.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/BooleanParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/RecordParser.ParseError.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/FieldFormatter.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/LargeObjectLoader.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/BigDecimalSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/SqoopRecord.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/class-use/LobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/package-summary.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/SqoopRecord.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/org/apache/sqoop/lib/LobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/serialized-form.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/deprecated-list.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/api/overview-summary.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/SqoopUserGuide.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/copyright' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop/docbook.css' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/man/man1' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-export.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-job.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-metastore.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-help.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-version.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-list-databases.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-list-tables.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-merge.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-import-all-tables.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-import.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-eval.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-codegen.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/man/man1/sqoop-create-hive-table.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/etc' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/etc/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/etc/sqoop/conf.dist' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/sqoop-site-template.xml' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/sqoop-site.xml' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/.gitignore' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/conf' owners='1' perm='lrwxrwxrwx' user='root' group='root' target='/etc/sqoop/conf' />
-  </content>
-</sqoop>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
index 40f5eb9c..c32b093c 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
@@ -142,48 +142,6 @@ when more advanced customization is required.</description>
     <alternatives>
     </alternatives>
   </solr-server>
-  <sqoop>
-    <metadata>
-      <summary>Tool for easy imports and exports of data sets between databases and the Hadoop ecosystem</summary>
-      <description>Sqoop is a tool that provides the ability to import and export data sets between the Hadoop Distributed File System (HDFS) and relational databases.</description>
-      <url>http://sqoop.apache.org</url>
-    </metadata>
-    <deps>
-      <bigtop-utils/>
-      <hadoop-client/>
-      <sqoop-client>/self</sqoop-client>
-    </deps>
-    <alternatives>
-      <sqoop-conf>
-        <status>auto</status>
-        <link>/etc/sqoop/conf</link>
-        <value>/etc/sqoop/conf.dist</value>
-        <alt>/etc/sqoop/conf.dist</alt>
-      </sqoop-conf>
-    </alternatives>
-    <groups>
-      <sqoop>
-        <user>sqoop</user>
-      </sqoop>
-    </groups>
-  </sqoop>
-  <sqoop-server>
-    <metadata>
-      <summary>Server for Sqoop.</summary>
-      <description>Centralized server for Sqoop.</description>
-      <url>http://sqoop.apache.org</url>
-    </metadata>
-    <deps>
-      <sqoop>/self</sqoop>
-    </deps>
-  </sqoop-server>
-  <sqoop-client>
-    <metadata>
-      <summary>Client for Sqoop.</summary>
-      <description>Lightweight client for Sqoop.</description>
-      <url>http://sqoop.apache.org</url>
-    </metadata>
-  </sqoop-client>
   <oozie>
     <metadata>
       <summary>Oozie is a system that runs workflows of Hadoop jobs.</summary>
@@ -196,7 +154,7 @@ when more advanced customization is required.</description>
 
  An Oozie workflow may contain the following types of actions nodes:
  map-reduce, map-reduce streaming, map-reduce pipes, pig, file-system,
- sub-workflows, java, hive, sqoop and ssh (deprecated).
+ sub-workflows, java, hive, and ssh (deprecated).
 
  Flow control operations within the workflow can be done using decision,
  fork and join nodes. Cycles in workflows are not supported.
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
index 27586873..a9691e0f 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
@@ -16,116 +16,6 @@
    limitations under the License.
 -->
 <packages>
-<sqoop>
-  <deps>
-    <tag name="/bin/bash"/>
-    <tag name="/bin/sh"/>
-    <jre>>=1.6</jre>
-  </deps>
-  <content>
-    <file name="/etc/sqoop/conf" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/etc/sqoop/conf/sqoop-site-template.xml" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/etc/sqoop/conf/sqoop-site.xml" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-codegen" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-create-hive-table" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-eval" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-export" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-help" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-import" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-import-all-tables" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-job" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-list-databases" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-list-tables" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-merge" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-metastore" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/bin/sqoop-version" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/configure-sqoop" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-codegen" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-create-hive-table" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-eval" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-export" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-help" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-import" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-import-all-tables" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-job" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-list-databases" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-list-tables" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-merge" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-metastore" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/sqoop-version" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/start-metastore.sh" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/bin/stop-metastore.sh" owners="1" perm="-rwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/conf" owners="1" perm="lrwxrwxrwx" user="root" group="root" target="/etc/sqoop/conf"/>
-    <file name="/usr/lib/sqoop/lib" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/lib/ant-contrib-1.0b3.jar" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/lib/ant-eclipse-1.0-jvm1.2.jar" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/lib/commons-io-1.4.jar" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/lib/sqoop/lib/ivy-2.0.0-rc2.jar" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/share/doc/sqoop" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/SqoopDevGuide.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/SqoopUserGuide.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/share/doc/sqoop/api" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/allclasses-frame.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/allclasses-noframe.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/share/doc/sqoop/api/com" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/constant-values.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/deprecated-list.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/help-doc.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/index-all.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/index.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/overview-tree.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/serialized-form.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/api/stylesheet.css" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/docbook.css" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/share/doc/sqoop/images" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/README" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <file name="/usr/share/doc/sqoop/images/callouts" owners="1" perm="drwxr-xr-x" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/1.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/10.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/11.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/12.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/13.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/14.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/15.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/2.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/3.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/4.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/5.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/6.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/7.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/8.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/callouts/9.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/caution.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/example.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/home.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/important.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/next.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/note.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/prev.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/tip.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/up.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/images/warning.png" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/doc/sqoop/index.html" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-codegen.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-create-hive-table.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-eval.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-export.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-help.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-import-all-tables.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-import.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-job.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-list-databases.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-list-tables.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-merge.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-metastore.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop-version.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-    <doc  name="/usr/share/man/man1/sqoop.1.gz" owners="1" perm="-rw-r--r--" user="root" group="root"/>
-  </content>
-</sqoop>
 <oozie>
   <users>
     <oozie>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
index efad25ad..eb3af48c 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
@@ -73,37 +73,6 @@
       </hive-webhcat-server>
     </services>
   </hive-webhcat-server>
-  <sqoop>
-    <deps>
-      <tag name="/bin/bash"/>
-      <tag name="/bin/sh"/>
-      <jre>&gt;=1.6</jre>
-    </deps>
-    <users>
-      <sqoop>
-        <home>/var/run/sqoop</home>
-        <descr>Sqoop User</descr>
-        <shell>/sbin/nologin</shell>
-      </sqoop>
-    </users>
-  </sqoop>
-  <sqoop-server>
-    <deps>
-      <redhat-lsb/>
-      <tag name="/bin/bash"/>
-      <tag name="/bin/sh"/>
-    </deps>
-    <services>
-      <sqoop-server>
-        <runlevel>2</runlevel> <!--workaround BIGTOP-644-->
-        <runlevel>3</runlevel>
-        <runlevel>4</runlevel>
-        <runlevel>5</runlevel>
-        <oninstall>stop</oninstall>
-        <configured>true</configured>
-      </sqoop-server>
-    </services>
-  </sqoop-server>
   <oozie>
     <users>
       <oozie>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml b/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml
deleted file mode 100644
index 70f2ca2d..00000000
--- a/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<sqoop>
-  <content>
-    <file name='/etc/sqoop/conf.dist' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/.gitignore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/sqoop-site-template.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/sqoop-site.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-server' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-export' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-help' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-import-all-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-job' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-list-databases' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-list-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/configure-sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-export' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-help' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-import-all-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-job' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-list-databases' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-list-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/start-metastore.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/stop-metastore.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/conf' owners='1' perm='lrwxrwxrwx' user='root' group='root' target='/etc/sqoop/conf' />
-    <file name='/usr/lib/sqoop/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/ant-contrib-1.0b3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/ant-eclipse-1.0-jvm1.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-ipc-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-mapred-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/commons-io-1.4.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jackson-core-asl-1.7.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jackson-mapper-asl-1.7.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jopt-simple-3.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/paranamer-2.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/snappy-java-1.0.3.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/sqoop-1.4.1-incubating.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/sqoop-test-1.4.1-incubating.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/SqoopDevGuide.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/SqoopUserGuide.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/allclasses-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/allclasses-noframe.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/constant-values.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/deprecated-list.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/help-doc.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/index-all.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/index.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/BigDecimalSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/BlobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/BooleanParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/ClobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/DelimiterSet.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/FieldFormatter.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/FieldMapProcessor.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/FieldMappable.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/JdbcWritableBridge.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/LargeObjectLoader.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/LobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/LobSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/ProcessingException.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/RecordParser.ParseError.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/RecordParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/SqoopRecord.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/BigDecimalSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/BlobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/BooleanParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/ClobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/DelimiterSet.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/FieldFormatter.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/FieldMapProcessor.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/FieldMappable.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/JdbcWritableBridge.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/LargeObjectLoader.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/LobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/LobSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/ProcessingException.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/RecordParser.ParseError.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/RecordParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/class-use/SqoopRecord.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/package-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/package-summary.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/package-tree.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/org/apache/sqoop/lib/package-use.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/overview-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/overview-summary.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/overview-tree.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/serialized-form.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/api/stylesheet.css' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/docbook.css' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/README' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/1.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/10.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/11.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/12.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/13.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/14.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/15.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/2.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/3.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/4.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/5.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/6.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/7.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/8.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/callouts/9.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/caution.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/example.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/home.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/important.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/next.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/note.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/prev.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/tip.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/up.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/images/warning.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/sqoop-BIGTOP-PACKAGE-VERSION/index.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-codegen.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-create-hive-table.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-eval.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-export.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-help.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-import-all-tables.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-import.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-job.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-list-databases.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-list-tables.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-merge.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-metastore.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-version.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-  </content>
-</sqoop>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
index b737c4d0..62e27f5b 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
@@ -70,36 +70,6 @@
       </hive-webhcat-server>
     </services>
   </hive-webhcat-server>
-  <sqoop>
-    <deps>
-      <jre>&gt;=1.6</jre>
-      <tag name="/bin/sh"/>
-      <tag name="/bin/bash"/>
-    </deps>
-    <users>
-      <sqoop>
-        <home>/var/run/sqoop</home>
-        <descr>Sqoop User</descr>
-        <shell>/sbin/nologin</shell>
-      </sqoop>
-    </users>
-  </sqoop>
-  <sqoop-server>
-    <deps>
-      <insserv/>
-      <tag name="/bin/bash"/>
-      <tag name="/bin/sh"/>
-    </deps>
-    <services>
-      <sqoop-server>
-        <runlevel>3</runlevel>
-        <runlevel>4</runlevel>
-        <runlevel>5</runlevel>
-        <oninstall>stop</oninstall>
-        <configured>true</configured>
-      </sqoop-server>
-    </services>
-  </sqoop-server>
   <oozie>
     <users>
       <oozie>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml
deleted file mode 100644
index 7020fe19..00000000
--- a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<sqoop>
-  <content>
-    <file name='/etc/sqoop/conf.dist' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/.gitignore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/sqoop-site-template.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <config name='/etc/sqoop/conf.dist/sqoop-site.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-server' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-export' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-help' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-import-all-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-job' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-list-databases' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-list-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/configure-sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-export' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-help' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-import-all-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-job' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-list-databases' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-list-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/start-metastore.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/bin/stop-metastore.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/conf' owners='1' perm='lrwxrwxrwx' user='root' group='root' target='/etc/sqoop/conf' />
-    <file name='/usr/lib/sqoop/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/ant-contrib-1.0b3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/ant-eclipse-1.0-jvm1.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-ipc-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/avro-mapred-1.5.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/commons-io-1.4.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jackson-core-asl-1.7.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jackson-mapper-asl-1.7.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/jopt-simple-3.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/paranamer-2.3.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/lib/snappy-java-1.0.3.2.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/sqoop-1.4.1-incubating.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/sqoop/sqoop-test-1.4.1-incubating.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/SqoopDevGuide.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/SqoopUserGuide.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/api' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/allclasses-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/allclasses-noframe.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/constant-values.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/deprecated-list.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/help-doc.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/index-all.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/index.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/api/org' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/api/org/apache' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/BigDecimalSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/BlobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/BooleanParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/ClobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/DelimiterSet.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/FieldFormatter.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/FieldMapProcessor.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/FieldMappable.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/JdbcWritableBridge.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/LargeObjectLoader.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/LobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/LobSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/ProcessingException.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/RecordParser.ParseError.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/RecordParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/SqoopRecord.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/BigDecimalSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/BlobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/BooleanParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/ClobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/DelimiterSet.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/FieldFormatter.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/FieldMapProcessor.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/FieldMappable.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/JdbcWritableBridge.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/LargeObjectLoader.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/LobRef.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/LobSerializer.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/ProcessingException.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/RecordParser.ParseError.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/RecordParser.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/class-use/SqoopRecord.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/package-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/package-summary.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/package-tree.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/org/apache/sqoop/lib/package-use.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/overview-frame.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/overview-summary.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/overview-tree.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/serialized-form.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/api/stylesheet.css' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/docbook.css' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/images' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/README' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/packages/sqoop/images/callouts' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/1.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/10.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/11.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/12.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/13.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/14.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/15.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/2.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/3.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/4.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/5.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/6.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/7.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/8.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/callouts/9.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/caution.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/example.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/home.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/important.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/next.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/note.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/prev.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/tip.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/up.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/images/warning.png' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/index.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/sqoop/sqoop-1.4.1-incubating.releasenotes.html' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-codegen.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-create-hive-table.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-eval.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-export.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-help.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-import-all-tables.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-import.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-job.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-list-databases.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-list-tables.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-merge.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-metastore.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop-version.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/man/man1/sqoop.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-  </content>
-</sqoop>
diff --git a/bigtop-tests/test-artifacts/pom.xml b/bigtop-tests/test-artifacts/pom.xml
index b3abdbdb..907b61c8 100644
--- a/bigtop-tests/test-artifacts/pom.xml
+++ b/bigtop-tests/test-artifacts/pom.xml
@@ -38,7 +38,6 @@
     <module>httpfs</module>
     <module>oozie</module>
     <module>hbase</module>
-    <module>sqoop</module>
     <module>hue</module>
     <module>solr</module>
     <module>longevity</module>
diff --git a/bigtop-tests/test-artifacts/sqoop/pom.xml b/bigtop-tests/test-artifacts/sqoop/pom.xml
deleted file mode 100644
index a2d07d72..00000000
--- a/bigtop-tests/test-artifacts/sqoop/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-
-<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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.bigtop.itest</groupId>
-    <artifactId>bigtop-smokes</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <groupId>org.apache.bigtop.itest</groupId>
-  <artifactId>sqoop-smoke</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
-  <name>sqoopsmokes</name>
-
-  <dependencies>
-      <dependency>
-          <groupId>org.apache.sqoop</groupId>
-          <artifactId>sqoop</artifactId>
-          <classifier>hadoop200</classifier>
-      </dependency>
-  </dependencies>
-
-  <build>
-  </build>
-
-</project>
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy b/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy
deleted file mode 100644
index 9dbdc7ad..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.bigtop.itest.integration.sqoop;
-
-import org.apache.bigtop.itest.shell.Shell
-import org.junit.Test
-import org.junit.Before
-import org.apache.bigtop.itest.JarContent
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotNull
-import org.junit.After
-import static org.junit.Assert.assertFalse;
-
-public class IntegrationTestSqoopHBase {
-  private static final String MYSQL_ROOTPW =
-    System.getProperty("MYSQL_ROOTPW", "");
-  private static final String HADOOP_HOME =
-    System.getenv("HADOOP_HOME");
-  private static final String SQOOP_HOME =
-    System.getenv("SQOOP_HOME");
-  private static final String HBASE_HOME =
-    System.getenv("HBASE_HOME");
-  private static final String ZOOKEEPER_HOME =
-    System.getenv("ZOOKEEPER_HOME");
-
-  static {
-    // make all validations of the above here
-    // check for mysql connector library
-    assertNotNull("SQOOP_HOME is unset", SQOOP_HOME);
-    assertNotNull("HBASE_HOME is unset", HBASE_HOME);
-    assertNotNull("ZOOKEEPER_HOME is unset", ZOOKEEPER_HOME);
-    assertNotNull("mysql connector jars are required to be present in $SQOOP_HOME/lib",
-      JarContent.getJarName("$SQOOP_HOME/lib", "mysql-connector-java.*.jar"));
-  }
-  private static final String DATA_DIR = 'hbase-sqoop';
-//  private static final String MYSQL_COMMAND = "mysql -u root -p${MYSQL_ROOTPW}";
-  private static final String MYSQL_COMMAND = "mysql";
-
-  private static Shell shell = new Shell("/bin/bash -s");
-
-  public static int mkdir(String path) {
-    Shell test = new Shell("/bin/bash -s");
-    test.exec("hadoop fs -mkdir $path");
-    return test.getRet();
-  }
-
-  public static int rmr(String path) {
-    Shell rmr = new Shell("/bin/bash -s");
-    rmr.exec("hadoop fs -rmr -skipTrash $path");
-    return rmr.getRet();
-  }
-
-  public static String mktemps() {
-    mkdir("IntegrationTestSqoopHBase-${(new Date().getTime())}");
-  }
-
-  @Before
-  public void setUp() {
-    JarContent.unpackJarContainer(IntegrationTestSqoopHBase.class, '.', DATA_DIR);
-
-    rmr('test_table');
-    shell.exec("cat $DATA_DIR/mysql-create-db.sql | $MYSQL_COMMAND -u root ${''.equals(MYSQL_ROOTPW) ?: '-p' + MYSQL_ROOTPW}");
-    assertEquals('Unable to run mysql-create-db.sql script', 0, shell.getRet());
-    shell.exec("cat $DATA_DIR/mysql-load-db.sql | $MYSQL_COMMAND -u root testhbase");
-    assertEquals('Unable to run mysql-load-db.sql script', 0, shell.getRet());
-    println "MySQL database prepared for test";
-
-    shell.exec("cat $DATA_DIR/drop-table.hxt | $HBASE_HOME/bin/hbase shell");
-    shell.exec("cat $DATA_DIR/create-table.hxt | $HBASE_HOME/bin/hbase shell")
-    def out = shell.out.join('\n');
-
-    assertFalse("Unable to create HBase table by script create-table.hxt",
-      (out =~ /ERROR/).find());
-  }
-
-  @After
-  public void tearDown() {
-    shell.exec("cat $DATA_DIR/drop-table.hxt | $HBASE_HOME/bin/hbase shell");
-    rmr('test_table');
-  }
-
-  @Test
-  public void hBaseSqoop() {
-    def hostname = shell.exec('hostname').out.get(0);
-    def dbURL = "jdbc:mysql://$hostname/testhbase";
-    def OUTFILE = 'outfile.txt';
-    //Run Sqoop HBase import now
-    shell.exec("$SQOOP_HOME/bin/sqoop import --connect $dbURL --username root --table test_table --hbase-table test_table --column-family data --verbose");
-    assertEquals("Failed to run Sqoop import with HBase", 0, shell.getRet());
-    // Verify if it was imported correctly
-    shell.exec("cat $DATA_DIR/select-table.hxt| ${HBASE_HOME}/bin/hbase shell | awk '/^ [0-9]+/ { print \$1\"  \"\$4 }' | sort > $OUTFILE");
-    shell.exec("sort $DATA_DIR/expected-hbase-output.txt > expected-hbase-output.txt.resorted");
-    // TODO need to conver shell callouts to power tools with Java parsing of
-    // ' 10                                    column=data:b, timestamp=1301075559859, value=ten'
-    assertEquals("HBase scan output did not match expected output. File: $OUTFILE",
-      0, shell.exec("diff -u $OUTFILE expected-hbase-output.txt.resorted").getRet());
-  }
-}
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy b/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy
deleted file mode 100644
index 30ffdb30..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.bigtop.itest.integration.sqoop
-
-import org.junit.Test
-import org.junit.After
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotNull
-import org.apache.bigtop.itest.JarContent
-import org.junit.Before
-import org.apache.bigtop.itest.shell.Shell
-
-class IntegrationTestSqoopHive {
-  private static final String MYSQL_ROOTPW =
-    System.getProperty("MYSQL_ROOTPW", "");
-  private static final String HADOOP_HOME =
-    System.getenv("HADOOP_HOME");
-  private static final String SQOOP_HOME =
-    System.getenv("SQOOP_HOME");
-  private static final String HIVE_HOME =
-    System.getenv("HIVE_HOME");
-  private static final String ZOOKEEPER_HOME =
-    System.getenv("ZOOKEEPER_HOME");
-
-  static {
-    // make all validations of the above here
-    // check for mysql connector library
-    assertNotNull("SQOOP_HOME is unset", SQOOP_HOME);
-    assertNotNull("HIVE_HOME is unset", HIVE_HOME);
-    assertNotNull("ZOOKEEPER_HOME is unset", ZOOKEEPER_HOME);
-    assertNotNull("mysql connector jars are required to be present in $SQOOP_HOME/lib",
-      JarContent.getJarName("$SQOOP_HOME/lib", "mysql-connector-java.*.jar"));
-  }
-  private static final String DATA_DIR = 'hive-sqoop';
-  private static final String MYSQL_COMMAND = "mysql";
-
-  private static Shell shell = new Shell("/bin/bash -s");
-  def final OUTFILE = 'outfile.txt';
-
-  public static int rmr(String path) {
-    Shell rmr = new Shell("/bin/bash -s");
-    rmr.exec("hadoop fs -rmr -skipTrash $path");
-    return rmr.getRet();
-  }
-
-  @Before
-  public void setUp() {
-    JarContent.unpackJarContainer(IntegrationTestSqoopHive.class, '.', DATA_DIR);
-
-    // MySQL preparations
-    rmr('test_table');
-    shell.exec("cat $DATA_DIR/mysql-create-db.sql | $MYSQL_COMMAND -u root ${''.equals(MYSQL_ROOTPW) ?: '-p' + MYSQL_ROOTPW}");
-    assertEquals('Unable to run mysql-create-db.sql script', 0, shell.getRet());
-    shell.exec("cat $DATA_DIR/mysql-load-db.sql | $MYSQL_COMMAND -u testhiveuser testhive");
-    assertEquals('Unable to run mysql-load-db.sql script', 0, shell.getRet());
-    println "MySQL database prepared for test";
-    // Hive preparations
-    shell.exec("$HIVE_HOME/bin/hive -f $DATA_DIR/hive-drop-table.hql");
-    assertEquals("Unable to run hive-drop-table.hql script",
-      0, shell.ret);
-  }
-
-  @After
-  public void tearDown() {
-    File outfile = new File(OUTFILE);
-    outfile.deleteOnExit();
-    shell.exec("$HIVE_HOME/bin/hive -f $DATA_DIR/hive-drop-table.hql");
-    rmr('test_table');
-  }
-
-  @Test
-  public void hiveSqoop() {
-    def hostname = shell.exec('hostname').out.get(0);
-    def dbURL = "jdbc:mysql://$hostname/testhive";
-    //Run Sqoop Hive import now
-    shell.exec("$SQOOP_HOME/bin/sqoop import --connect $dbURL --username root --table test_table --hive-import --verbose");
-    assertEquals("Failed to run Sqoop import with Hive", 0, shell.getRet());
-    // Verify if it was imported correctly
-    shell.exec("${HIVE_HOME}/bin/hive -f $DATA_DIR/hive-select-table.hql > $OUTFILE");
-    assertEquals("Unable to run hive-select-table.hql script", 0, shell.ret);
-    assertEquals("Hive output did not match expected output. File: $OUTFILE",
-      0, shell.exec("diff -u $OUTFILE $DATA_DIR/expected-hive-output.txt").getRet());
-  }
-}
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/create-table.hxt b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/create-table.hxt
deleted file mode 100644
index 89c0a6ef..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/create-table.hxt
+++ /dev/null
@@ -1 +0,0 @@
-create 'test_table', 'data'
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/drop-table.hxt b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/drop-table.hxt
deleted file mode 100644
index 0db06324..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/drop-table.hxt
+++ /dev/null
@@ -1,2 +0,0 @@
-disable 'test_table'
-drop 'test_table'
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/expected-hbase-output.txt b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/expected-hbase-output.txt
deleted file mode 100644
index 436d97f4..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/expected-hbase-output.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-10  value=ten
-11  value=eleven
-12  value=twelve
-1  value=one
-2  value=two
-3  value=three
-4  value=four
-5  value=five
-6  value=six
-7  value=seven
-8  value=eight
-9  value=nine
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/mysql-create-db.sql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/mysql-create-db.sql
deleted file mode 100644
index 04b74f1d..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/mysql-create-db.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- 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.
-
-#
-# Run this script once as root user before the test run. For example:
-# mysql -u root -p < /path/to/this/script.sql
-#
-
-#
-# Drop old databases
-#
-drop database if exists testhbase;
-
-#
-# Create new database
-#
-create database testhbase;
-
-#
-# Grant permissions to the testhbaseuser
-#
-use mysql;
-grant all privileges on testhbase.* to 'testhbaseuser'@'localhost';
-grant all privileges on testhbase.* to 'testhbaseuser'@'%';
-grant all privileges on testhbase.* to 'root'@'%';
-flush privileges;
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/mysql-load-db.sql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/mysql-load-db.sql
deleted file mode 100644
index a5d5a94d..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/mysql-load-db.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- 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.
-
-#
-# Run this script as testhbaseuser, specifically for the testhbase database.
-# This script must be run after the mysql-create-db.sql has been run as root.
-# Example of command to run this script:
-# mysql testhbase -u testhbaseuser < /path/to/this/script.sql
-#
-
-#
-# Drop test_table
-#
-drop table if exists test_table;
-
-#
-# Create test_table
-#
-create table test_table (a integer primary key, b varchar(32));
-
-#
-# Load table data
-#
-insert into test_table values (1, 'one'), (2, 'two'), (3, 'three'), (4, 'four'),
-   (5, 'five'), (6, 'six'), (7, 'seven'), (8, 'eight'), (9, 'nine'), (10, 'ten'),
-   (11, 'eleven'), (12, 'twelve');
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/select-table.hxt b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/select-table.hxt
deleted file mode 100644
index fb0dbf6a..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hbase-sqoop/select-table.hxt
+++ /dev/null
@@ -1 +0,0 @@
-scan 'test_table'
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/expected-hive-output.txt b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/expected-hive-output.txt
deleted file mode 100644
index e2e1c8f8..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/expected-hive-output.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-1	one
-2	two
-3	three
-4	four
-5	five
-6	six
-7	seven
-8	eight
-9	nine
-10	ten
-11	eleven
-12	twelve
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/hive-drop-table.hql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/hive-drop-table.hql
deleted file mode 100644
index 78f7ffda..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/hive-drop-table.hql
+++ /dev/null
@@ -1,15 +0,0 @@
--- 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.
-drop table if exists test_table
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/hive-select-table.hql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/hive-select-table.hql
deleted file mode 100644
index 28a7acb2..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/hive-select-table.hql
+++ /dev/null
@@ -1,15 +0,0 @@
--- 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.
-select * from test_table order by a
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/mysql-create-db.sql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/mysql-create-db.sql
deleted file mode 100644
index aac8e87a..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/mysql-create-db.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- 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.
-
-#
-# Run this script once as root user before the test run. For example:
-# mysql -u root -p < /path/to/this/script.sql
-#
-
-#
-# Drop old databases
-#
-drop database if exists testhive;
-
-#
-# Create new database
-#
-create database testhive;
-
-#
-# Grant permissions to the testhiveuser
-#
-use mysql;
-grant all privileges on testhive.* to 'testhiveuser'@'localhost';
-grant all privileges on testhive.* to 'testhiveuser'@'%';
-grant all privileges on testhive.* to 'root'@'%';
-flush privileges;
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/mysql-load-db.sql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/mysql-load-db.sql
deleted file mode 100644
index 717f967a..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/hive-sqoop/mysql-load-db.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- 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.
-
-#
-# Run this script as testhiveuser, specifically for the testhive database.
-# This script must be run after the mysql-create-db.sql has been run as root.
-# Example of command to run this script:
-# mysql testhive -u testhiveuser < /path/to/this/script.sql
-#
-
-#
-# Drop test_table
-#
-drop table if exists test_table;
-
-#
-# Create test_table
-#
-create table test_table (a integer primary key, b varchar(32));
-
-#
-# Load table data
-#
-insert into test_table values (1, 'one'), (2, 'two'), (3, 'three'), (4, 'four'),
-   (5, 'five'), (6, 'six'), (7, 'seven'), (8, 'eight'), (9, 'nine'), (10, 'ten'),
-   (11, 'eleven'), (12, 'twelve');
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-create-db.sql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-create-db.sql
deleted file mode 100644
index 7746241d..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-create-db.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
-drop database if exists mysqltestdb;
-
-create database mysqltestdb;
-
-use mysqltestdb;
-
-grant all privileges on mysqltestdb.* to 'root'@'%';
-
-flush privileges;
-
-/* create database2 for import-all */
-
-drop database if exists mysqltestdb2;
-
-create database mysqltestdb2;
-
-use mysqltestdb2;
-
-grant all privileges on mysqltestdb2.* to 'root'@'%';
-
-flush privileges;
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-create-tables.sql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-create-tables.sql
deleted file mode 100644
index 5a4a7cec..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-create-tables.sql
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
-/* functional test db tables */
-use mysqltestdb;
-
-drop table if exists t_bool;
-create table t_bool ( pri int not null auto_increment, a boolean, primary key (pri));
-
-drop table if exists t_int;
-create table t_int ( pri int not null auto_increment,a tinyint, b smallint, c mediumint , d int, e integer , f bigint,primary key (pri));
-
-drop table if exists t_fp;
-create table t_fp (pri int not null auto_increment, a decimal (6,4), b float (6,4), c double precision (6,4),d float (4),primary key (pri));
-
-drop table if exists t_date;
-create table t_date (pri int not null auto_increment,a date , c timestamp, d time , e year(4),primary key (pri));
-
-drop table if exists t_string;
-create table t_string (pri int not null auto_increment, a char (5), b varchar (5), c text , d tinytext, e mediumtext, f mediumtext, g longtext, h enum ('A','B'),primary key (pri));
-
-drop table if exists testtable;
-create table testtable ( id int , fname varchar (20), lname varchar(20) , primary key (id)); 
-
-drop table if exists testtable2;
-create table testtable2 ( id int , fname varchar (20), lname varchar(20) , primary key (id));
-
-drop table if exists testnullvalues;
-create table testnullvalues ( id int , a int , b varchar(20) , primary key (id));
-
-/* import-all test db-tables */
-
-use mysqltestdb2;
-
-drop table if exists testtable;
-create table testtable ( id int , fname varchar (20), lname varchar(20) , primary key (id)); 
-
-drop table if exists testtable2;
-create table testtable2 ( id int , fname varchar (20), lname varchar(20) , primary key (id));
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-insert-data.sql b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-insert-data.sql
deleted file mode 100644
index c8aef22c..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/mysql-insert-data.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
-use mysqltestdb;
-
-insert into t_int (a,b,c,d,e,f) values (127,32767,8388607,2147483647,-2147483648,9223372036854775807);
-
-insert into t_bool (a) values (1);
-
-insert into t_fp(a,b,c,d) values (-99.9999,-99.9999,99.9999,99.99);
-
-insert into t_date (a,c,d,e) values  ('9999-12-31',19731230153000,'23:59:59','2155');
-
-insert into t_string (a,b,c,d,e,f,g,h) values ('aaa','aaa','0GIQM3CONg5jAUloRoP7f76TJrYkYnto5i76IUDbKuG1dMSP5znIM6Ct3qc1WdRCD9THFjWXBIxOoAqhOgdFQEwICX7fYN4n9P3AOoo3ZrnUBu3rtuwf9Y2HXJvUBgAqs44Ypdg6iv511JQSufMeKvbLIpIbk9saJW82EeTgoWkAS7lhI0HJXmvyDkJEqOc0VxdT0ySR','0GIQM3CONg5jAUloRoP7f76TJrYkYnto5i76IUDbKuG1dMSP5znIM6Ct3qc1WdRCD9THFjWXBIxOoAqhOgdFQEwICX7fYN4n9P3AOoo3ZrnUBu3rtuwf9Y2HXJvUBgAqs44Ypdg6iv511JQSufMeKvbLIpIbk9saJW82EeTgoWkAS7lhI0HJXmvyDkJEqOc0VxdT0ySR','0GIQM3CONg5jAUloRoP7f76TJr [...]
-
-insert into testtable values (1,'aaa','aaa');
-insert into testtable values (2,'bbb','bbb');
-insert into testtable values (3,'ccc','ccc');
-insert into testtable values (4,'ddd','ddd');
-insert into testtable values (5,'eee','eee');
-insert into testtable values (6,'fff','fff');
-insert into testtable values (7,'ggg','ggg');
-insert into testtable values (8,'hhh','hhh');
-insert into testtable values (9,'iii','iii');
-insert into testtable values (10,'jjj','jjj');
-
-
-insert into testtable2 values (1,'111','111');
-insert into testtable2 values (2,'222','222');
-insert into testtable2 values (3,'333','333');
-
-
-insert into testnullvalues (id) values (1);
-insert into testnullvalues (id,a) values (2,2);
-insert into testnullvalues (id,b) values (3,'aaa');
-
-/* data for import-all test */
-
-use mysqltestdb2;
-
-insert into testtable values (1,'aaa','aaa');
-insert into testtable2 values (1,'aaa','aaa');
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-all-tables.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-all-tables.out
deleted file mode 100644
index 855e5507..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-all-tables.out
+++ /dev/null
@@ -1,2 +0,0 @@
-1,aaa,aaa
-1,aaa,aaa
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-append.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-append.out
deleted file mode 100644
index 98d09c42..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-append.out
+++ /dev/null
@@ -1,20 +0,0 @@
-1,aaa,aaa
-2,bbb,bbb
-3,ccc,ccc
-4,ddd,ddd
-5,eee,eee
-6,fff,fff
-7,ggg,ggg
-8,hhh,hhh
-9,iii,iii
-10,jjj,jjj
-1,aaa,aaa
-2,bbb,bbb
-3,ccc,ccc
-4,ddd,ddd
-5,eee,eee
-6,fff,fff
-7,ggg,ggg
-8,hhh,hhh
-9,iii,iii
-10,jjj,jjj
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-columns.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-columns.out
deleted file mode 100644
index dd3c9732..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-columns.out
+++ /dev/null
@@ -1,10 +0,0 @@
-1,aaa
-2,bbb
-3,ccc
-4,ddd
-5,eee
-6,fff
-7,ggg
-8,hhh
-9,iii
-10,jjj
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-null-non-string.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-null-non-string.out
deleted file mode 100644
index c1ef1444..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-null-non-string.out
+++ /dev/null
@@ -1,3 +0,0 @@
-1,10,null
-2,2,null
-3,10,aaa
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-null-string.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-null-string.out
deleted file mode 100644
index acddc7b2..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-null-string.out
+++ /dev/null
@@ -1,3 +0,0 @@
-1,null,mynullstring
-2,2,mynullstring
-3,null,aaa
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-query.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-query.out
deleted file mode 100644
index 786a05c2..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-query.out
+++ /dev/null
@@ -1,2 +0,0 @@
-1,111
-2,222
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_bool-export.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_bool-export.out
deleted file mode 100644
index 94742401..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_bool-export.out
+++ /dev/null
@@ -1 +0,0 @@
-1,1
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_bool.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_bool.out
deleted file mode 100644
index 5f49b200..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_bool.out
+++ /dev/null
@@ -1 +0,0 @@
-1,true
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_date-export.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_date-export.out
deleted file mode 100644
index 992838ef..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_date-export.out
+++ /dev/null
@@ -1 +0,0 @@
-1,"9999-12-31","9999-12-31 23:59:59","1973-12-30 15:30:00","23:59:59","2155"
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_date.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_date.out
deleted file mode 100644
index 54cf66f4..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_date.out
+++ /dev/null
@@ -1 +0,0 @@
-1,9999-12-31,1973-12-30 15:30:00.0,23:59:59,2155
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_fp.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_fp.out
deleted file mode 100644
index 1ce8d4ff..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_fp.out
+++ /dev/null
@@ -1 +0,0 @@
-1,-99.9999,-99.9999,99.9999,99.99
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_int.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_int.out
deleted file mode 100644
index 00a5f1ad..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_int.out
+++ /dev/null
@@ -1 +0,0 @@
-1,127,32767,8388607,2147483647,-2147483648,9223372036854775807
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_string.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_string.out
deleted file mode 100644
index d98f0df5..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-t_string.out
+++ /dev/null
@@ -1 +0,0 @@
-1,aaa,aaa,0GIQM3CONg5jAUloRoP7f76TJrYkYnto5i76IUDbKuG1dMSP5znIM6Ct3qc1WdRCD9THFjWXBIxOoAqhOgdFQEwICX7fYN4n9P3AOoo3ZrnUBu3rtuwf9Y2HXJvUBgAqs44Ypdg6iv511JQSufMeKvbLIpIbk9saJW82EeTgoWkAS7lhI0HJXmvyDkJEqOc0VxdT0ySR,0GIQM3CONg5jAUloRoP7f76TJrYkYnto5i76IUDbKuG1dMSP5znIM6Ct3qc1WdRCD9THFjWXBIxOoAqhOgdFQEwICX7fYN4n9P3AOoo3ZrnUBu3rtuwf9Y2HXJvUBgAqs44Ypdg6iv511JQSufMeKvbLIpIbk9saJW82EeTgoWkAS7lhI0HJXmvyDkJEqOc0VxdT0ySR,0GIQM3CONg5jAUloRoP7f76TJrYkYnto5i76IUDbKuG1dMSP5znIM6Ct3qc1WdRCD9THFjWXBIxOoAqh [...]
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-testtable.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-testtable.out
deleted file mode 100644
index 4f78d6ec..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-testtable.out
+++ /dev/null
@@ -1,10 +0,0 @@
-1,aaa,aaa
-2,bbb,bbb
-3,ccc,ccc
-4,ddd,ddd
-5,eee,eee
-6,fff,fff
-7,ggg,ggg
-8,hhh,hhh
-9,iii,iii
-10,jjj,jjj
diff --git a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-where-clause.out b/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-where-clause.out
deleted file mode 100644
index 1eeb5976..00000000
--- a/bigtop-tests/test-artifacts/sqoop/src/main/resources/mysql-files/sqoop-where-clause.out
+++ /dev/null
@@ -1,4 +0,0 @@
-1,aaa,aaa
-2,bbb,bbb
-3,ccc,ccc
-4,ddd,ddd
diff --git a/bigtop-tests/test-execution/integration/pom.xml b/bigtop-tests/test-execution/integration/pom.xml
index 839bef5b..e09752ff 100644
--- a/bigtop-tests/test-execution/integration/pom.xml
+++ b/bigtop-tests/test-execution/integration/pom.xml
@@ -36,15 +36,11 @@
   <properties>
     <itest-conf.version>${project.version}</itest-conf.version>
     <itest-common.version>${project.version}</itest-common.version>
-    <sqoop-integration.version>${project.version}</sqoop-integration.version>
   </properties>
 
   <!--
     List of modules which should be executed as a part of stack testing run
   -->
-  <modules>
-    <module>sqoop</module>
-  </modules>
 
   <dependencyManagement>
     <dependencies>
@@ -56,12 +52,6 @@
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.apache.bigtop.itest</groupId>
-        <artifactId>sqoop-integration</artifactId>
-        <version>${sqoop-integration.version}</version>
-        <scope>test</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/bigtop-tests/test-execution/integration/sqoop/pom.xml b/bigtop-tests/test-execution/integration/sqoop/pom.xml
deleted file mode 100644
index 62f460eb..00000000
--- a/bigtop-tests/test-execution/integration/sqoop/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<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/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.apache.bigtop.itest</groupId>
-    <artifactId>integration-tests</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.bigtop.itest</groupId>
-  <artifactId>sqoop-integration-execution</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
-  <name>sqoop-integration-execution</name>
-
-  <properties>
-    <!--Additional environment variables are required-->
-    <SQOOP_HOME>${env.SQOOP_HOME}</SQOOP_HOME>
-    <HBASE_HOME>${env.HBASE_HOME}</HBASE_HOME>
-    <HIVE_HOME>${env.HIVE_HOME}</HIVE_HOME>
-    <ZOOKEEPER_HOME>${env.ZOOKEEPER_HOME}</ZOOKEEPER_HOME>
-    <!-- Integration tests are special -->
-    <org.apache.maven-failsafe-plugin.testInclude>**/IntegrationTest*</org.apache.maven-failsafe-plugin.testInclude>
-    <org.apache.maven-dependency-plugin.groupId>org.apache.bigtop.itest</org.apache.maven-dependency-plugin.groupId>
-    <org.apache.maven-dependency-plugin.artifactId>sqoop-integration</org.apache.maven-dependency-plugin.artifactId>
-    <org.apache.maven-dependency-plugin.version>${sqoop-integration.version}</org.apache.maven-dependency-plugin.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.bigtop.itest</groupId>
-      <artifactId>sqoop-integration</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <id>enforce-property</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireProperty>
-                  <property>SQOOP_HOME</property>
-                  <message>SQOOP_HOME env. variable has to be set</message>
-                </requireProperty>
-                <requireProperty>
-                  <property>HBASE_HOME</property>
-                  <message>HBASE_HOME env. variable has to be set</message>
-                </requireProperty>
-                <requireProperty>
-                  <property>HIVE_HOME</property>
-                  <message>HIVE_HOME env. variable has to be set</message>
-                </requireProperty>
-                <requireProperty>
-                  <property>ZOOKEEPER_HOME</property>
-                  <message>ZOOKEEPER_HOME env. variable has to be set</message>
-                </requireProperty>
-              </rules>
-              <fail>true</fail>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-failsafe-plugin.version}</version>
-        <configuration>
-          <systemPropertyVariables>
-            <MYSQL_ROOTPW></MYSQL_ROOTPW>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/bigtop-tests/test-execution/smokes/pom.xml b/bigtop-tests/test-execution/smokes/pom.xml
index db5bc5f5..3ed3f33e 100644
--- a/bigtop-tests/test-execution/smokes/pom.xml
+++ b/bigtop-tests/test-execution/smokes/pom.xml
@@ -59,7 +59,6 @@
     <module>hue</module>
     <!--
     <module>httpfs</module>
-    <module>sqoop</module>
     -->
     <module>hcatalog</module>
     <module>phoenix</module>
diff --git a/bigtop-tests/test-execution/smokes/sqoop/pom.xml b/bigtop-tests/test-execution/smokes/sqoop/pom.xml
deleted file mode 100644
index c6fd544a..00000000
--- a/bigtop-tests/test-execution/smokes/sqoop/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<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/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.apache.bigtop.itest</groupId>
-    <artifactId>smoke-tests</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.bigtop.itest</groupId>
-  <artifactId>sqoop-smoke-execution</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
-  <name>Sqoop smoke test execution</name>
-  
-  <properties>
-    <!--Additional environment variables are required-->
-    <SQOOP_URL>${env.SQOOP_URL}</SQOOP_URL>
-    <MYSQL_HOST>${env.MYSQL_HOST}</MYSQL_HOST>
- 
-    <!-- Integration tests are special -->
-    <org.apache.maven-dependency-plugin.groupId>org.apache.bigtop.itest</org.apache.maven-dependency-plugin.groupId>
-    <org.apache.maven-dependency-plugin.artifactId>sqoop-smoke</org.apache.maven-dependency-plugin.artifactId>
-    <org.apache.maven-dependency-plugin.version>3.2.0-SNAPSHOT</org.apache.maven-dependency-plugin.version>
-    <org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${org.apache.maven-dependency-plugin.groupId}</groupId>
-      <artifactId>${org.apache.maven-dependency-plugin.artifactId}</artifactId>
-      <version>${org.apache.maven-dependency-plugin.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <id>enforce-property</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireProperty>
-                  <property>SQOOP_URL</property>
-                  <message>SQOOP_URL env. variable has to be set</message>
-                </requireProperty>
-                <requireProperty>
-                  <property>MYSQL_HOST</property>
-                  <message>MYSQL_HOST env. variable has to be set</message>
-                </requireProperty>
-              </rules>
-              <fail>true</fail>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-failsafe-plugin.version}</version>
-        <configuration>
-          <systemPropertyVariables>
-            <sqoop.server.url>${SQOOP_URL}</sqoop.server.url>
-            <mysql.host>${MYSQL_HOST}</mysql.host>
-          </systemPropertyVariables>
-          <forkMode>always</forkMode>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/bigtop.bom b/bigtop.bom
index e2ad89a4..a069bcbf 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -114,7 +114,7 @@ bigtop {
     'bigtop-groovy':['hadoop'],
     'bigtop-jsvc':['hadoop'],
     zookeeper:['hadoop', 'hbase', 'kafka'],
-    hadoop:['hbase', 'hive', 'tez', 'sqoop',
+    hadoop:['hbase', 'hive', 'tez',
       'oozie', 'solr', 'spark', 'ranger',
       'phoenix', 'alluxio', 'ycsb', 'zeppelin'
     ],
@@ -183,16 +183,6 @@ bigtop {
                 site = "${apache.APACHE_MIRROR}/${download_path}"
                 archive = "${apache.APACHE_ARCHIVE}/${download_path}" }
     }
-    'sqoop' {
-      name    = 'sqoop'
-      relNotes = 'Apache Sqoop v1'
-      version { base = '1.4.7'; pkg = base; release = 3 }
-      tarball { destination = "${name}-${version.base}.tar.gz"
-                source      = destination }
-      url     { download_path = "/$name/${version.base}/"
-                site = "${apache.APACHE_MIRROR}/${download_path}"
-                archive = "${apache.APACHE_ARCHIVE}/${download_path}" }
-    }
     'oozie' {
       name    = 'oozie'
       relNotes = 'Apache Oozie'
diff --git a/pom.xml b/pom.xml
index 3ddefbe8..4f0398ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@
   <properties>
     <hadoop.version>2.7.3</hadoop.version>
     <hbase.version>1.1.9</hbase.version>
-    <sqoop.version>1.4.6</sqoop.version>
     <zookeeper.version>3.4.6</zookeeper.version>
     <solr.version>4.10.4</solr.version>
     <spark.version>2.1.0</spark.version>
@@ -209,13 +208,6 @@
         <artifactId>solr-solrj</artifactId>
         <version>${solr.version}</version>
       </dependency>
-      <!-- Sqoop -->
-      <dependency>
-        <groupId>org.apache.sqoop</groupId>
-        <artifactId>sqoop</artifactId>
-        <classifier>hadoop200</classifier>
-        <version>${sqoop.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-core_2.10</artifactId>
diff --git a/provisioner/utils/smoke-tests.sh b/provisioner/utils/smoke-tests.sh
index d4160c65..0cc254e7 100755
--- a/provisioner/utils/smoke-tests.sh
+++ b/provisioner/utils/smoke-tests.sh
@@ -48,7 +48,6 @@ export LIVY_HOME=${LIVY_HOME:-/usr/lib/livy}
 export OOZIE_TAR_HOME=${OOZIE_TAR_HOME:-/usr/lib/oozie}
 export OOZIE_URL=${OOZIE_URL:-http://localhost:11000/oozie}
 export SPARK_HOME=${SPARK_HOME:-/usr/lib/spark}
-export SQOOP_HOME=${SQOOP_HOME:-/usr/lib/sqoop}
 export TEZ_HOME=${TEZ_HOME:-/usr/lib/tez}
 export WEBHDFS_URL=${WEBHDFS_URL:-$(hostname):50070/webhdfs/v1}
 export YCSB_HOME=${YCSB_HOME:-/usr/lib/ycsb}