You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by se...@apache.org on 2021/03/31 23:51:54 UTC

[bigtop] branch master updated: BIGTOP-3529. Drop bigtop-tomcat. (#762)

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

sekikn 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 84cd9d9  BIGTOP-3529. Drop bigtop-tomcat. (#762)
84cd9d9 is described below

commit 84cd9d9e57c54983c1a2d4426ca7b8d35bfb4394
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Thu Apr 1 08:51:43 2021 +0900

    BIGTOP-3529. Drop bigtop-tomcat. (#762)
---
 bigtop-ci/jenkins/jobsCreator.groovy               |  6 +-
 .../src/common/bigtop-tomcat/do-component-build    | 26 -------
 .../src/common/bigtop-tomcat/install_tomcat.sh     | 90 ----------------------
 ...0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff | 21 -----
 ...1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff | 31 --------
 .../src/common/hadoop/httpfs-tomcat-deployment.sh  | 38 ---------
 bigtop-packages/src/deb/bigtop-tomcat/changelog    |  1 -
 bigtop-packages/src/deb/bigtop-tomcat/compat       |  1 -
 bigtop-packages/src/deb/bigtop-tomcat/control      | 28 -------
 bigtop-packages/src/deb/bigtop-tomcat/copyright    | 15 ----
 bigtop-packages/src/deb/bigtop-tomcat/rules        | 36 ---------
 .../src/deb/bigtop-tomcat/source/format            |  1 -
 .../src/rpm/bigtop-tomcat/BUILD/.gitignore         |  0
 .../src/rpm/bigtop-tomcat/RPMS/.gitignore          |  0
 .../src/rpm/bigtop-tomcat/SOURCES/.gitignore       |  0
 .../src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec | 63 ---------------
 .../src/rpm/bigtop-tomcat/SRPMS/.gitignore         |  0
 .../src/main/resources/apt/bigtop-tomcat.xml       | 67 ----------------
 .../package/src/main/resources/package_data.xml    | 10 ---
 .../src/main/resources/urpmi/bigtop-tomcat.xml     |  5 --
 .../src/main/resources/yum/bigtop-tomcat.xml       | 60 ---------------
 .../src/main/resources/zypper/bigtop-tomcat.xml    | 60 ---------------
 bigtop.bom                                         | 13 +---
 23 files changed, 4 insertions(+), 568 deletions(-)

diff --git a/bigtop-ci/jenkins/jobsCreator.groovy b/bigtop-ci/jenkins/jobsCreator.groovy
index b36dcc2..581f692 100644
--- a/bigtop-ci/jenkins/jobsCreator.groovy
+++ b/bigtop-ci/jenkins/jobsCreator.groovy
@@ -16,10 +16,10 @@
  */
 
 // FIXME: it would be nice to extract the following from bigtop.mk on the fly
-def bigtopComponents = ["bigtop-groovy", "bigtop-jsvc", "bigtop-tomcat", "bigtop-utils",
-                        "zookeeper", "hadoop", "hbase", "hive", "pig",
+def bigtopComponents = ["bigtop-groovy", "bigtop-jsvc", "bigtop-utils",
+                        "zookeeper", "hadoop", "hbase", "hive",
                         "oozie", "phoenix",
-                        "solr", "spark", "sqoop", "alluxio", "whirr"]
+                        "solr", "spark", "sqoop", "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-packages/src/common/bigtop-tomcat/do-component-build b/bigtop-packages/src/common/bigtop-tomcat/do-component-build
deleted file mode 100644
index c70326f..0000000
--- a/bigtop-packages/src/common/bigtop-tomcat/do-component-build
+++ /dev/null
@@ -1,26 +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
-
-# This download may fail and is unneccesary
-sed -i '/<!-- Download NSIS (Nullsoft Scriptable Install System) -->/,+5d' build.xml
-mkdir dl
-
-ant -Dbase.path=dl -Dskip.installer=true dist-static package-tgz
-
-mkdir build
-tar -C build --strip-components=1 -xzf output/release/v*/bin/apache-tomcat-*[0-9].tar.gz
diff --git a/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh b/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
deleted file mode 100644
index 88ef087..0000000
--- a/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
+++ /dev/null
@@ -1,90 +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 -e
-
-usage() {
-  echo "
-usage: $0 <options>
-  Required not-so-options:
-     --build-dir=DIR             path to Tomcat dist.dir
-     --prefix=PREFIX             path to install into
-
-  Optional options:
-     --doc-dir=DIR               path to install docs into [/usr/share/doc/bigtop-tomcat]
-     --lib-dir=DIR               path to install Tomcat home [/usr/lib/bigtop-tomcat]
-  "
-  exit 1
-}
-
-OPTS=$(getopt \
-  -n $0 \
-  -o '' \
-  -l 'prefix:' \
-  -l 'doc-dir:' \
-  -l 'lib-dir:' \
-  -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
-    usage
-fi
-
-eval set -- "$OPTS"
-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
-        ;;
-        --)
-        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/bigtop-tomcat}
-LIB_DIR=${LIB_DIR:-/usr/lib/bigtop-tomcat}
-
-# First we'll move everything into lib
-install -d -m 0755 $PREFIX/$LIB_DIR
-(cd $BUILD_DIR && tar -cf - .) | (cd $PREFIX/$LIB_DIR && tar -xf -)
-
-rm -rf $PREFIX/$LIB_DIR/webapps
-mv -f $PREFIX/$LIB_DIR/conf $PREFIX/$LIB_DIR/conf.template
-
-install -d -m 0755 $PREFIX/$DOC_DIR
-mv $PREFIX/$LIB_DIR/{RUNNING.txt,RELEASE-NOTES,NOTICE,LICENSE} $PREFIX/$DOC_DIR
diff --git a/bigtop-packages/src/common/bigtop-tomcat/patch0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff b/bigtop-packages/src/common/bigtop-tomcat/patch0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff
deleted file mode 100644
index 9a3affb..0000000
--- a/bigtop-packages/src/common/bigtop-tomcat/patch0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/build.properties.default b/build.properties.default
-index 565eb53603..57ec1c65ff 100644
---- a/build.properties.default
-+++ b/build.properties.default
-@@ -145,13 +145,13 @@ jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
- jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
- 
- # ----- Tomcat native library -----
--tomcat-native.version=1.2.24
-+tomcat-native.version=1.2.25
- tomcat-native.src.checksum.enabled=true
- tomcat-native.src.checksum.algorithm=SHA-512
--tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
-+tomcat-native.src.checksum.value=e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d
- tomcat-native.win.checksum.enabled=true
- tomcat-native.win.checksum.algorithm=SHA-512
--tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
-+tomcat-native.win.checksum.value=0171a7ff3db708c2051e1f7a188286c5174091e208e1822c3027dd7aa415562c94be8d397a61bbe57bf9ee40ab52e1b346123fb7f2b170a43c60e8596eb65618
- tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
- tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
- tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/bigtop-packages/src/common/bigtop-tomcat/patch1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff b/bigtop-packages/src/common/bigtop-tomcat/patch1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff
deleted file mode 100644
index 0911a8f..0000000
--- a/bigtop-packages/src/common/bigtop-tomcat/patch1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/build.properties.default b/build.properties.default
-index 0d70217f69..e506f8e840 100644
---- a/build.properties.default
-+++ b/build.properties.default
-@@ -179,20 +179,20 @@ nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
- nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
- 
- # ----- Commons Daemon, version 1.2.0 or later -----
--commons-daemon.version=1.2.2
-+commons-daemon.version=1.2.3
- 
--# checksum for commons-daemon-1.2.1-bin.tar.gz
-+# checksum for commons-daemon-1.2.3-bin.tar.gz
- commons-daemon.bin.checksum.enabled=true
- commons-daemon.bin.checksum.algorithm=SHA-512
--commons-daemon.bin.checksum.value=f9fb917aaf398f61c42796eb4168664e076f81bc3fae82790eb39c723f03a1e7cbc2304161938d8d8993b7fbb718214b94740dbf9679f6ef93e85b5a2e861761
-+commons-daemon.bin.checksum.value=0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447
- 
--# checksums for commons-daemon-1.2.1-native-src.tar.gz, commons-daemon-1.2.1-bin-windows.zip
-+# checksums for commons-daemon-1.2.3-native-src.tar.gz, commons-daemon-1.2.3-bin-windows.zip
- commons-daemon.native.src.checksum.enabled=true
- commons-daemon.native.src.checksum.algorithm=SHA-512
--commons-daemon.native.src.checksum.value=45ad856a8a6b024e80905cfac5a741a57ab86479ecd65adab9641f5444d3a2362bb13d1ea38ec3db5eb89d30c29f2f6d3b0e48cbf2f60c081c4df2451acd1ab4
-+commons-daemon.native.src.checksum.value=5f223ee3c133f673fe698f575d7cfb15f27fbbb8acf2e6db292e0e1690a20d636b35312187aa1091b315062f2434788eec9cde167e2ae1d7e673ebdd2ddb41f6
- commons-daemon.native.win.checksum.enabled=true
- commons-daemon.native.win.checksum.algorithm=SHA-512
--commons-daemon.native.win.checksum.value=16e7a6fc5bc83ada3bcf9e10cc69ef21400dc019d1f2be00caec0bce72c3bc5a7c72116878e12b4851a15bb473c0948a9c14e1a86b6addcefa6c20638dbcc88c
-+commons-daemon.native.win.checksum.value=c79ee31a367addc5d49db474aabe084cebcd4f7f0f0f9ddc7999c02d4de5cd6ace6d5f55a230f399cfaaf780179b6f9808739efc7500b18c27cdb963daaef8d5
- 
- commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
- commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/bigtop-packages/src/common/hadoop/httpfs-tomcat-deployment.sh b/bigtop-packages/src/common/hadoop/httpfs-tomcat-deployment.sh
deleted file mode 100644
index 0b965a0..0000000
--- a/bigtop-packages/src/common/hadoop/httpfs-tomcat-deployment.sh
+++ /dev/null
@@ -1,38 +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.
-
-# This script must be sourced so that it can set CATALINA_BASE for the parent process
-
-TOMCAT_CONF=${TOMCAT_CONF:-`readlink -e /etc/hadoop-httpfs/tomcat-conf`}
-TOMCAT_DEPLOYMENT=${TOMCAT_DEPLOYMENT:-/var/lib/hadoop-httpfs/tomcat-deployment}
-HTTPFS_HOME=${HTTPFS_HOME:-/usr/lib/hadoop-httpfs}
-
-rm -rf ${TOMCAT_DEPLOYMENT}
-mkdir ${TOMCAT_DEPLOYMENT}
-cp -r ${TOMCAT_CONF}/conf ${TOMCAT_DEPLOYMENT}/
-cp -r ${HTTPFS_HOME}/webapps ${TOMCAT_DEPLOYMENT}/
-cp -r ${TOMCAT_CONF}/WEB-INF/* ${TOMCAT_DEPLOYMENT}/webapps/webhdfs/WEB-INF/
-
-if [ -n "${BIGTOP_CLASSPATH}" ] ; then
-  sed -i -e "s#^\(common.loader=.*\)\$#\1,${BIGTOP_CLASSPATH/:/,}#" ${TOMCAT_DEPLOYMENT}/conf/catalina.properties
-fi
-
-chown -R httpfs:httpfs ${TOMCAT_DEPLOYMENT}
-chmod -R 755 ${TOMCAT_DEPLOYMENT}
-
-export CATALINA_BASE=${TOMCAT_DEPLOYMENT}
-
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/changelog b/bigtop-packages/src/deb/bigtop-tomcat/changelog
deleted file mode 100644
index 547ed02..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/changelog
+++ /dev/null
@@ -1 +0,0 @@
---- This is auto-generated 
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/compat b/bigtop-packages/src/deb/bigtop-tomcat/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/control b/bigtop-packages/src/deb/bigtop-tomcat/control
deleted file mode 100644
index 4c255d4..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/control
+++ /dev/null
@@ -1,28 +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: bigtop-tomcat
-Section: misc
-Priority: extra
-Maintainer: Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.0
-Homepage: http://tomcat.apache.org/
-
-Package: bigtop-tomcat
-Architecture: all
-Depends: bigtop-utils (>= 0.7)
-Description: Apache Tomcat 
- Apache Tomcat is an open source software implementation of the
- Java Servlet and JavaServer Pages technologies. 
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/copyright b/bigtop-packages/src/deb/bigtop-tomcat/copyright
deleted file mode 100644
index 38645ff..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: http://tomcat.apache.org/
-Upstream-Name: Apache Tomcat
-
-Files: *
-Copyright: 2010-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/bigtop-tomcat/rules b/bigtop-packages/src/deb/bigtop-tomcat/rules
deleted file mode 100755
index cc490f1..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/rules
+++ /dev/null
@@ -1,36 +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 -Dmaven.repo.local=${HOME}/.m2/repository
-
-override_dh_auto_install:
-	bash -x debian/install_tomcat.sh                             \
-	  --build-dir=build                                          \
-	  --doc-dir=/usr/share/doc/bigtop-tomcat \
-	  --prefix=debian/bigtop-tomcat
diff --git a/bigtop-packages/src/deb/bigtop-tomcat/source/format b/bigtop-packages/src/deb/bigtop-tomcat/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/bigtop-packages/src/deb/bigtop-tomcat/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec b/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
deleted file mode 100644
index 09248af..0000000
--- a/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
+++ /dev/null
@@ -1,63 +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_tomcat %{_usr}/lib/%{name}
-
-%if  %{?suse_version:1}0
-  %define doc_tomcat %{_docdir}/%{name}
-%else
-  %define doc_tomcat %{_docdir}/%{name}-%{version}
-%endif
-
-Name: bigtop-tomcat
-Version: %{bigtop_tomcat_version}
-Release: %{bigtop_tomcat_release}
-Summary: Apache Tomcat
-URL: http://tomcat.apache.org/
-Group: Development/Libraries
-BuildArch: noarch
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-License: ASL 2.0
-Source0: apache-tomcat-%{bigtop_tomcat_base_version}.tar.gz
-Source1: do-component-build
-Source2: install_tomcat.sh
-#BIGTOP_PATCH_FILES
-Requires: bigtop-utils >= 0.7
-
-%description 
-Apache Tomcat is an open source software implementation of the
-Java Servlet and JavaServer Pages technologies.
-
-%prep
-%setup -n apache-tomcat-%{bigtop_tomcat_base_version}-src
-
-#BIGTOP_PATCH_COMMANDS
-
-%build
-bash %{SOURCE1}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-bash %{SOURCE2} \
-          --build-dir=build \
-	  --doc-dir=%{doc_tomcat} \
-          --prefix=$RPM_BUILD_ROOT
-
-%files 
-%defattr(-,root,root)
-%attr(0755,root,root) %{lib_tomcat}
-%doc %{doc_tomcat}
-
-%changelog
-
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/.gitignore b/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-tomcat.xml b/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-tomcat.xml
deleted file mode 100644
index 8720593..0000000
--- a/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-tomcat.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<bigtop-tomcat>
-  <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/lib' owners='-1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/temp' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/temp/safeToDelete.tmp' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/catalina.policy' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/web.xml' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/tomcat-users.xml' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/logging.properties' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/server.xml' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/context.xml' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/catalina.properties' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina-tasks.xml' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tool-wrapper.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/setclasspath.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/digest.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/commons-daemon-native.tar.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/shutdown.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/startup.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/commons-daemon.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/setclasspath.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/bootstrap.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/version.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/startup.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tomcat-native.tar.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tomcat-juli.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/shutdown.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/cpappend.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tool-wrapper.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/version.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/digest.bat' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/work' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/el-api.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-ha.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jsp-api.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-ja.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-tribes.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/servlet-api.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/ecj-3.7.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-ant.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jasper.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jasper-el.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-es.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-fr.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-coyote.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/annotations-api.jar' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/logs' owners='1' perm='drwxr-xr-x' 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/bigtop-tomcat' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/bigtop-tomcat/RUNNING.txt.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/bigtop-tomcat/RELEASE-NOTES.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/bigtop-tomcat/NOTICE' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/bigtop-tomcat/changelog.Debian.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/bigtop-tomcat/LICENSE.gz' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <file name='/usr/share/doc/bigtop-tomcat/copyright' owners='1' perm='-rw-r--r--' user='root' group='root' />
-  </content>
-</bigtop-tomcat>
\ No newline at end of file
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 813dea3..40f5eb9 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
@@ -42,14 +42,6 @@
     </deps>
   </bigtop-groovy>
 
-  <bigtop-tomcat>
-    <metadata>
-      <summary>Apache Tomcat</summary>
-      <description>Apache Tomcat is an open source software implementation of the
-Java Servlet and JavaServer Pages technologies.</description>
-      <url>http://tomcat.apache.org/</url>
-    </metadata>
-  </bigtop-tomcat>
   <spark-core>
     <metadata>
       <summary>Lightning-Fast Cluster Computing</summary>
@@ -123,7 +115,6 @@ when more advanced customization is required.</description>
       <url>http://lucene.apache.org/solr</url>
     </metadata>
     <deps>
-      <bigtop-tomcat/>
       <bigtop-utils/>
     </deps>
     <alternatives>
@@ -158,7 +149,6 @@ when more advanced customization is required.</description>
       <url>http://sqoop.apache.org</url>
     </metadata>
     <deps>
-      <bigtop-tomcat/>
       <bigtop-utils/>
       <hadoop-client/>
       <sqoop-client>/self</sqoop-client>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/bigtop-tomcat.xml b/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/bigtop-tomcat.xml
deleted file mode 100644
index 0574a73..0000000
--- a/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/bigtop-tomcat.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<bigtop-tomcat>
-  <content>
-    <file name='/.' owners=1 perm='drwxr-xr-x' user='root' group='root' />
-  </content>
-</bigtop-tomcat>
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/yum/bigtop-tomcat.xml b/bigtop-tests/test-artifacts/package/src/main/resources/yum/bigtop-tomcat.xml
deleted file mode 100644
index 86a0dde..0000000
--- a/bigtop-tests/test-artifacts/package/src/main/resources/yum/bigtop-tomcat.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<bigtop-tomcat>
-  <content>
-    <file name='/usr/lib/bigtop-tomcat' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/bootstrap.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina-tasks.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/commons-daemon-native.tar.gz' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/commons-daemon.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/cpappend.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/digest.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/digest.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/setclasspath.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/setclasspath.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/shutdown.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/shutdown.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/startup.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/startup.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tomcat-juli.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tomcat-native.tar.gz' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tool-wrapper.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tool-wrapper.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/version.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/version.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/catalina.policy' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/catalina.properties' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/context.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/logging.properties' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/server.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/tomcat-users.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/web.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/annotations-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-ant.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-ha.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-tribes.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/ecj-3.7.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/el-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jasper-el.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jasper.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jsp-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/servlet-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-coyote.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-es.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-fr.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-ja.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/logs' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/temp' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/temp/safeToDelete.tmp' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/work' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/bigtop-tomcat-BIGTOP-PACKAGE-VERSION' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/bigtop-tomcat-BIGTOP-PACKAGE-VERSION/LICENSE' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/bigtop-tomcat-BIGTOP-PACKAGE-VERSION/NOTICE' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/bigtop-tomcat-BIGTOP-PACKAGE-VERSION/RELEASE-NOTES' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/bigtop-tomcat-BIGTOP-PACKAGE-VERSION/RUNNING.txt' owners='1' perm='-rw-r--r--' user='root' group='root' />
-  </content>
-</bigtop-tomcat>
\ No newline at end of file
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/bigtop-tomcat.xml b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/bigtop-tomcat.xml
deleted file mode 100644
index a739156..0000000
--- a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/bigtop-tomcat.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<bigtop-tomcat>
-  <content>
-    <file name='/usr/lib/bigtop-tomcat' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/bootstrap.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina-tasks.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/catalina.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/commons-daemon-native.tar.gz' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/commons-daemon.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/cpappend.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/digest.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/digest.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/setclasspath.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/setclasspath.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/shutdown.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/shutdown.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/startup.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/startup.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tomcat-juli.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tomcat-native.tar.gz' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tool-wrapper.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/tool-wrapper.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/version.bat' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/bin/version.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/catalina.policy' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/catalina.properties' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/context.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/logging.properties' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/server.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/tomcat-users.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/conf.template/web.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/annotations-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-ant.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-ha.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina-tribes.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/catalina.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/ecj-3.7.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/el-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jasper-el.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jasper.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/jsp-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/servlet-api.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-coyote.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-es.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-fr.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/lib/tomcat-i18n-ja.jar' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/logs' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/temp' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/temp/safeToDelete.tmp' owners='1' perm='-rwxr-xr-x' user='root' group='root' />
-    <file name='/usr/lib/bigtop-tomcat/work' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <file name='/usr/share/doc/packages/bigtop-tomcat' owners='1' perm='drwxr-xr-x' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/bigtop-tomcat/LICENSE' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/bigtop-tomcat/NOTICE' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/bigtop-tomcat/RELEASE-NOTES' owners='1' perm='-rw-r--r--' user='root' group='root' />
-    <doc  name='/usr/share/doc/packages/bigtop-tomcat/RUNNING.txt' owners='1' perm='-rw-r--r--' user='root' group='root' />
-  </content>
-</bigtop-tomcat>
\ No newline at end of file
diff --git a/bigtop.bom b/bigtop.bom
index fe73c3b..fba17de 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -109,11 +109,10 @@ bigtop {
       To build a component with its dependencies, run build with -Dbuildwithdeps=true
   */
   dependencies = [
-    'bigtop-utils':['ambari', 'bigtop-groovy', 'bigtop-jsvc', 'bigtop-tomcat',
+    'bigtop-utils':['ambari', 'bigtop-groovy', 'bigtop-jsvc',
                     'elasticsearch', 'flink', 'logstash', 'zookeeper'],
     'bigtop-groovy':['hadoop'],
     'bigtop-jsvc':['hadoop'],
-    'bigtop-tomcat':['oozie'],
     zookeeper:['hadoop', 'hbase', 'kafka'],
     hadoop:['hbase', 'hive', 'tez', 'sqoop',
       'oozie', 'solr', 'spark',
@@ -279,16 +278,6 @@ bigtop {
                 site = "${apache.APACHE_MIRROR}/${download_path}"
                 archive = "${apache.APACHE_ARCHIVE}/${download_path}" }
     }
-    'bigtop-tomcat' {
-      name    = "bigtop-tomcat"
-      relNotes = "Apache Tomcat"
-      version { base = '8.5.57'; pkg = base; release = 1 }
-      tarball { source      = "apache-tomcat-${version.base}-src.tar.gz"
-                destination = "apache-tomcat-${version.base}.tar.gz" }
-      url     { download_path = "/tomcat/tomcat-8/v${version.base}/src"
-                site = "${apache.APACHE_MIRROR}/${download_path}"
-                archive = "${apache.APACHE_ARCHIVE}/${download_path}" }
-    }
     'alluxio' {
       name    = "alluxio"
       pkg     = "alluxio"