diff --git a/.blazar.yaml b/.blazar.yaml
index 79dd6763ec60..b428c52712bf 100644
--- a/.blazar.yaml
+++ b/.blazar.yaml
@@ -1,19 +1,16 @@
 buildpack:
-  name: Blazar-Buildpack-Java
+  name: Blazar-Buildpack-Java-single-module
 
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
 env:
-  MAVEN_ARGS: ""
+  MAVEN_PHASE: "package assembly:single deploy"
+  HADOOP_DEP_VERSION: "3.3.6-hubspot-SNAPSHOT"
+  MAVEN_ARGS: "-Phadoop-3.0 -Dhadoop.profile=3.0 -Dhadoop-three.version=$HADOOP_DEP_VERSION -Dgpg.skip=true -DskipTests -DdeployAtEnd -pl hbase-assembly -am"
+
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: ""
   SET_VERSION: ""
   HBASE_VERSION: ""
   PKG_RELEASE: ""
@@ -23,3 +20,6 @@ before:
   - description: "Prepare build environment"
     commands:
       - $WORKSPACE/build-scripts/prepare_environment.sh
+
+provides:
+  - hbase
diff --git a/build-scripts/copy_blazar_yaml.sh b/build-scripts/copy_blazar_yaml.sh
deleted file mode 100755
index ca38a8ede221..000000000000
--- a/build-scripts/copy_blazar_yaml.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-poms=$(find . -name pom.xml)
-
-for pom in $poms; do
-    module=$(dirname $pom)
-    if [[ "$module" != "." && "$module" != "./hbase-assembly" && "$module" != ./hubspot-client-bundles* ]]; then
-        cp .blazar.yaml $module/.blazar.yaml
-    fi
-done
diff --git a/build-scripts/prepare_environment.sh b/build-scripts/prepare_environment.sh
index 33bc38b378a3..4c3b10d9f014 100755
--- a/build-scripts/prepare_environment.sh
+++ b/build-scripts/prepare_environment.sh
@@ -10,14 +10,6 @@
 set -ex
 printenv
 
-if [ $1 = "cdh5" ]; then
-  HADOOP_DEP_VERSION="2.6.0-cdh5.16.2"
-  VERSION_ARGS="-Phadoop-2.0 -Dhadoop-two.version=$HADOOP_DEP_VERSION"
-else
-  HADOOP_DEP_VERSION="3.3.1"
-  VERSION_ARGS="-Phadoop-3.0 -Dhadoop.profile=3.0 -Dhadoop-three.version=$HADOOP_DEP_VERSION"
-fi
-
 # We base the expected main branch and resulting maven version for clients on the hbase minor version
 # The reason for this is hbase re-branches for each minor release (2.4, 2.5, 2.6, etc). At each re-branch
 # the histories diverge. So we'll need to create our own fork of each new minor release branch.
@@ -25,12 +17,6 @@ fi
 MINOR_VERSION="2.5"
 MAIN_BRANCH="hubspot-${MINOR_VERSION}"
 
-# If we bump our hadoop build version, we should bump this as well
-# At some point it would be good to more closely link this to our hadoop build, but that can only happen
-# once we update our apache-hadoop build to do a full maven. At which point we can probably change this to
-# like 3.0-hubspot-SNAPSHOT and leave it at that.
-MAVEN_ARGS="$VERSION_ARGS -Dgpg.skip=true -DskipTests=true"
-
 #
 # Validate inputs from blazar
 #
@@ -78,10 +64,12 @@ echo "Git branch $GIT_BRANCH. Detecting appropriate version override and RPM rel
 RELEASE="hs"
 
 if [[ "$GIT_BRANCH" = "$MAIN_BRANCH" ]]; then
-    MAVEN_VERSION="${MINOR_VERSION}-hubspot-SNAPSHOT"
+    SET_VERSION="${MINOR_VERSION}-hubspot-SNAPSHOT"
+    YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8="8_hs-hbase"
 elif [[ "$GIT_BRANCH" != "hubspot" ]]; then
-    MAVEN_VERSION="${MINOR_VERSION}-${GIT_BRANCH}-SNAPSHOT"
+    SET_VERSION="${MINOR_VERSION}-${GIT_BRANCH}-SNAPSHOT"
     RELEASE="${RELEASE}~${GIT_BRANCH//[^[:alnum:]]/_}"
+    YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8="8_hs-hbase-develop"
 else
     echo "Invalid git branch $GIT_BRANCH"
     exit 1
@@ -90,16 +78,14 @@ fi
 RELEASE="${RELEASE}.${BUILD_NUMBER}"
 FULL_BUILD_VERSION="${HBASE_VERSION}-${RELEASE}"
 
-# Add into MAVEN_ARGS because we added this property in hbase-common/pom.xml so we
-# could accurately reflect the full build version in the UI and elsewhere.
-MAVEN_ARGS="$MAVEN_ARGS -Dhubspot.build.version=$HBASE_VERSION"
-
-write-build-env-var MAVEN_ARGS "$MAVEN_ARGS"
-write-build-env-var SET_VERSION "$MAVEN_VERSION"
+# SET_VERSION is not the most intuitive name, but it's required for set-maven-versions script
+write-build-env-var SET_VERSION "$SET_VERSION"
 write-build-env-var HBASE_VERSION "$HBASE_VERSION"
 write-build-env-var PKG_RELEASE "$RELEASE"
 write-build-env-var FULL_BUILD_VERSION "$FULL_BUILD_VERSION"
+write-build-env-var YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8 "$YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8"
 
 echo "Building HBase version $HBASE_VERSION"
-echo "Will use maven version $MAVEN_VERSION"
+echo "Will deploy to nexus with version $SET_VERSION"
+echo "Will create rpm with version $FULL_BUILD_VERSION"
 echo "Will run maven with extra args $MAVEN_ARGS"
diff --git a/hbase-annotations/.blazar.yaml b/hbase-annotations/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-annotations/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-archetypes/.blazar.yaml b/hbase-archetypes/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-archetypes/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-archetypes/hbase-archetype-builder/.blazar.yaml b/hbase-archetypes/hbase-archetype-builder/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-archetypes/hbase-archetype-builder/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-archetypes/hbase-client-project/.blazar.yaml b/hbase-archetypes/hbase-client-project/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-archetypes/hbase-client-project/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-archetypes/hbase-shaded-client-project/.blazar.yaml b/hbase-archetypes/hbase-shaded-client-project/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-archetypes/hbase-shaded-client-project/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-assembly/.blazar.yaml b/hbase-assembly/.blazar.yaml
deleted file mode 100644
index 13d4ffe6b435..000000000000
--- a/hbase-assembly/.blazar.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-provides:
-  - name: hbase-rpm
-
-env:
-  RPM_BUILD_COMMAND: "./rpm-build/build.sh"
-  RPM_REPOS: "8_hs-hbase${GIT_NON_DEFAULT_BRANCH:+-develop} aarch64_8_hs-hbase${GIT_NON_DEFAULT_BRANCH:+-develop}"
-  MAVEN_PHASE: package assembly:single
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
-
-stepActivation:
-  uploadRpms:
-    branchRegexes: [".*"]
diff --git a/hbase-assembly/rpm-build/build.sh b/hbase-assembly/rpm-build/build.sh
deleted file mode 100755
index 7942f258463f..000000000000
--- a/hbase-assembly/rpm-build/build.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-RPM_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-# If not specified, extract the version.
-if [[ "X$HBASE_VERSION" = "X" ]]; then
-    echo "Must specifiy \$HBASE_VERSION"
-    exit 1
-fi
-
-# Setup scratch dir
-SCRATCH_DIR="${RPM_DIR}/scratch"
-
-rm -rf $SCRATCH_DIR
-mkdir -p ${SCRATCH_DIR}/{SOURCES,SPECS,RPMS,SRPMS}
-cp -a $RPM_DIR/sources/* ${SCRATCH_DIR}/SOURCES/
-cp $RPM_DIR/hbase.spec ${SCRATCH_DIR}/SPECS/
-
-# Set up src dir
-SRC_DIR="${RPM_DIR}/hbase-$HBASE_VERSION"
-TAR_NAME=hbase-$HBASE_VERSION.tar.gz
-
-rm -rf $SRC_DIR
-rsync -a $RPM_DIR/../../ $SRC_DIR --exclude rpm-assembly --exclude .git
-
-pushd $SRC_DIR/../
-tar -czf ${SCRATCH_DIR}/SOURCES/${TAR_NAME} $(basename $SRC_DIR)
-popd
-
-# Build srpm
-
-rpmbuild \
-    --define "_topdir $SCRATCH_DIR" \
-    --define "input_tar $TAR_NAME" \
-    --define "mvn_target_dir $RPM_DIR/../target" \
-    --define "hbase_version ${HBASE_VERSION}" \
-    --define "release ${PKG_RELEASE}%{?dist}" \
-    -bs --nodeps --buildroot="${SCRATCH_DIR}/INSTALL" \
-    ${SCRATCH_DIR}/SPECS/hbase.spec
-
-src_rpm=$(ls -1 ${SCRATCH_DIR}/SRPMS/hbase-*)
-
-# build rpm
-
-rpmbuild \
-    --define "_topdir $SCRATCH_DIR" \
-    --define "input_tar $TAR_NAME" \
-    --define "mvn_target_dir $RPM_DIR/../target" \
-    --define "hbase_version ${HBASE_VERSION}" \
-    --define "release ${PKG_RELEASE}%{?dist}" \
-    --rebuild $src_rpm
-
-if [[ -d $RPMS_OUTPUT_DIR ]]; then
-    mkdir -p $RPMS_OUTPUT_DIR
-
-    # Move rpms to output dir for upload
-
-    find ${SCRATCH_DIR}/{SRPMS,RPMS} -name "*.rpm" -exec mv {} $RPMS_OUTPUT_DIR/ \;
-fi
diff --git a/hbase-assembly/rpm-build/sources/hbase.default b/hbase-assembly/rpm-build/sources/hbase.default
deleted file mode 100644
index a0058d2e4056..000000000000
--- a/hbase-assembly/rpm-build/sources/hbase.default
+++ /dev/null
@@ -1,41 +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.
-
-export HBASE_HOME="/usr/lib/hbase"
-export HBASE_CONF_DIR="/etc/hbase/conf"
-
-export HBASE_PID_DIR="/var/run/hbase"
-export HBASE_LOG_DIR="/var/log/hbase"
-export HBASE_IDENT_STRING=hbase
-
-# Up to 100 region servers can be run on a single host by specifying offsets
-# here or as CLI args when using init scripts. Each offset identifies an
-# instance and is used to determine the network ports it uses. Each instance
-# will have have its own log and pid files.
-#
-# REGIONSERVER_OFFSETS="1 2 3"
-
-#
-# Set the starting port to be assigned for HBASE RS JMX monitoring when 
-# running multiple region servers on a node. Each RS will be assigned a JMX port
-# which will be equal to starting JMX port + offset
-#
-# export JMXPORT=10103
-
-#
-# Set a directory which will be used for Java temp directory. For multi RS the
-# directory will be appended with offset to make it unique for each JVM process
-#
-# export JAVA_TMP_DIR="/tmp/java_tmp_dir"
diff --git a/hbase-assembly/rpm-build/sources/hbase.nofiles.conf b/hbase-assembly/rpm-build/sources/hbase.nofiles.conf
deleted file mode 100644
index 0520c2deb8dc..000000000000
--- a/hbase-assembly/rpm-build/sources/hbase.nofiles.conf
+++ /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.
-
-hbase - nofile 32768
diff --git a/hbase-assembly/rpm-build/sources/hbase.svc b/hbase-assembly/rpm-build/sources/hbase.svc
deleted file mode 100644
index e6eec4568979..000000000000
--- a/hbase-assembly/rpm-build/sources/hbase.svc
+++ /dev/null
@@ -1,92 +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.
-
-DAEMON="hbase-@HBASE_DAEMON@"
-DESC="HBase @HBASE_DAEMON@ daemon"
-EXEC_PATH="/usr/lib/hbase/bin/hbase-daemon.sh"
-SVC_USER="hbase"
-WORKING_DIR="/var/lib/hbase"
-DAEMON_FLAGS=""
-CONF_DIR="/etc/hbase/conf"
-PIDFILE="/var/run/hbase/hbase-${DAEMON}.pid"
-
-generate_functions() {
-cat <<'__EOT__'
-
-hbase_env() {
-    export HBASE_HOME=/usr/lib/hbase
-    BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
-    [ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hbase ] && . ${BIGTOP_DEFAULTS_DIR}/hbase
-}
-
-__EOT__
-}
-
-generate_start() {
-
-cat <<'__EOT__'
-start() {
-    hbase_env
-
-    [ -x $EXEC_PATH ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-
-    checkstatusofproc
-    status=$?
-    if [ "$status" -eq "$STATUS_RUNNING" ]; then
-        log_success_msg "${DESC} is running"
-        exit 0
-    fi
-
-    runuser -s /bin/bash hbase -c "${EXEC_PATH} start @HBASE_DAEMON@"
-
-    checkstatusofproc
-    RETVAL=$?
-
-    if [ $RETVAL -eq $STATUS_RUNNING ]; then
-      touch $LOCKFILE
-      log_success_msg "Started ${DESC} (${DAEMON}): "
-    else
-      log_failure_msg "Failed to start ${DESC}. Return value: $RETVAL"
-    fi
-
-    return $RETVAL
-}
-__EOT__
-
-}
-
-generate_stop() {
-
-cat <<'__EOT__'
-stop() {
-    hbase_env
-
-    runuser -s /bin/bash hbase -c "${EXEC_PATH} stop @HBASE_DAEMON@"
-    sleep 3
-    RETVAL=$?
-
-    if [ $RETVAL -eq $RETVAL_SUCCESS ]; then
-      log_success_msg "Stopped ${DESC}: "
-      rm -f $LOCKFILE $PIDFILE
-    else
-      log_failure_msg "Failure to stop ${DESC}. Return value: $RETVAL"
-    fi
-
-    return $RETVAL
-}
-__EOT__
-
-}
-
diff --git a/hbase-assembly/rpm-build/sources/init.d.tmpl b/hbase-assembly/rpm-build/sources/init.d.tmpl
deleted file mode 100644
index 3730a2a6e21e..000000000000
--- a/hbase-assembly/rpm-build/sources/init.d.tmpl
+++ /dev/null
@@ -1,311 +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 is a poor man's templating engine for generating init.d scripts to
-# support all the Apache services that Bigtop distro has. An actual init.d
-# script gets generate via running this script under bash and giving it
-# a mandatory argument of a file containing the configuration for the service.
-# The argument file should be a valid piece of bash code since it gets directly
-# source into this template. E.g.
-#    $ bash ./init.d.tmpl hadoop-hdfs-namenode.svc rpm hadoop-hdfs-namenode
-#
-# You must declare the following in your .svc configuration file:
-#     DAEMON="name of the resulting init.d script"
-#     DESC="Free form human readable description of the service"
-#     EXEC_PATH="path to the upstream daemon management script"
-#     SVC_USER="user to run this service as"
-#     DAEMON_FLAGS="flags to be passed to the $EXEC_PATH"
-#     WORKING_DIR="working directory to cd into before starting the daemon"
-#     CONF_DIR="path to the configuration directory"
-#     PIDFILE="file holding a PID of the running daemon"
-#     LOCKFILE="file signifying the service lock"
-#
-#     CHKCONFIG="chkconfig(8) registration signature"
-#     INIT_DEFAULT_START="run levels to use"
-#     INIT_DEFAULT_STOP="run levels not to use ;-)"
-#
-# You can, also, override parts of the generated init.d script by providing
-# function definitions for: generate_start, generate_stop, generate_functions, and generate_extra_commands.
-# See the default implemenations below and feel free to customize. Also look
-# for exising .svc files in common to see how different services are tweaking
-# the defaults.
-#
-# Of course, if this whole templating thing grows too big we might need to
-# consider a real templating engine (I have played with m4, but it seems
-# qutie brittle when used for manipulating pieces of the shell code -- think
-# $0 the like).
-
-if [ $# -lt 3 ] ; then
-  echo "Usage: ${BASH_SOURCE-0} service.definition.svc rpm|deb init.d.script"
-  exit 1
-fi
-
-# Override anything necessary for supported systems
-case "$2" in
-  "deb" )
-    # The defaults will work well on Debian-based systems
-    ;;
-  "rpm" )
-    # On RedHat, SuSE and Mageia run-level 2 is networkless, hence excluding it
-    CHKCONFIG="345 85 15"
-    INIT_DEFAULT_START="3 4 5"
-    INIT_DEFAULT_STOP="0 1 2 6"
-    ;;
-  "*" )
-    ;;
-esac
-
-# Create the init script, make it executable, and send stdout to it
-mkdir -p `dirname $3`
-touch $3
-chmod 0755 $3
-exec > $3
-
-generate_start() {
-
-cat <<'__EOT__'
-
-start() {
-  [ -x $EXEC_PATH ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-  [ -d $CONF_DIR ] || exit $ERROR_PROGRAM_NOT_CONFIGURED
-
-  runuser -s /bin/bash $SVC_USER -c "cd $WORKING_DIR && $EXEC_PATH --config '$CONF_DIR' start $DAEMON_FLAGS"
-
-  # Some processes are slow to start
-  sleep $SLEEP_TIME
-  checkstatusofproc
-  RETVAL=$?
-
-  if [ $RETVAL -eq $STATUS_RUNNING ]; then
-    touch $LOCKFILE
-    log_success_msg "Started ${DESC}: "
-  else
-	log_failure_msg "Failed to start ${DESC}. Return value: $RETVAL"
-  fi
-  return $RETVAL
-}
-
-__EOT__
-
-}
-
-generate_stop() {
-
-cat <<'__EOT__'
-
-stop() {
-  start_daemon $EXEC_PATH --config "$CONF_DIR" stop $DAEMON_FLAGS
-  RETVAL=$?
-
-  if [ $RETVAL -eq $RETVAL_SUCCESS ]; then
-	 log_success_msg "Stopped ${DESC}: "
-	 rm -f $LOCKFILE $PIDFILE
- else
-	 log_failure_msg "Failed to stop ${DESC}. Return value: $RETVAL."
- fi
-}
-
-__EOT__
-
-}
-
-generate_functions() {
-    :
-}
-
-generate_extra_commands() {
-
-cat <<'__EOT__'
-    *)
-      echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart|force-reload}"
-      exit 1
-__EOT__
-
-}
-
-###################################################################
-# Some reasonable defaults for the run-level settings, these are
-# tweaked on a per-OS basis from the SPEC/rules files that call us
-# and can be further tweaked inside of individual .svc templates
-CHKCONFIG=${CHKCONFIG:-"2345 85 15"}
-INIT_DEFAULT_START=${INIT_DEFAULT_START:-"2 3 4 5"}
-INIT_DEFAULT_STOP=${INIT_DEFAULT_STOP:-"0 1 6"}
-
-###################################################################
-# NOTE how we are sourcing the argument here so that a user-defined
-# settings have a chance to override the default values for
-# generate_start, generate_stop, generate_functions and generate_extra_commands. If you
-# ever want to make this template even more flexible -- define the
-# default values above this line
-. $1
-
-cat <<__EOT__
-#!/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 $DESC
-#
-# chkconfig: $CHKCONFIG
-# description: $DESC
-# pidfile: $PIDFILE
-### BEGIN INIT INFO
-# Provides:          $DAEMON
-# Short-Description: $DESC
-# Default-Start:     $INIT_DEFAULT_START
-# Default-Stop:      $INIT_DEFAULT_STOP
-# Required-Start:    \$syslog \$remote_fs
-# Required-Stop:     \$syslog \$remote_fs
-# Should-Start:
-# Should-Stop:
-### END INIT INFO
-
-. /lib/lsb/init-functions
-DEFAULTS_DIR=\${DEFAULTS_DIR-/etc/default}
-[ -n "\${DEFAULTS_DIR}" -a -r \${DEFAULTS_DIR}/hadoop ] && . \${DEFAULTS_DIR}/hadoop
-[ -n "\${DEFAULTS_DIR}" -a -r \${DEFAULTS_DIR}/$DAEMON ] && . \${DEFAULTS_DIR}/$DAEMON
-
-RETVAL_SUCCESS=0
-
-STATUS_RUNNING=0
-STATUS_DEAD=1
-STATUS_DEAD_AND_LOCK=2
-STATUS_NOT_RUNNING=3
-STATUS_OTHER_ERROR=102
-
-
-ERROR_PROGRAM_NOT_INSTALLED=5
-ERROR_PROGRAM_NOT_CONFIGURED=6
-
-
-RETVAL=0
-SLEEP_TIME=5
-PROC_NAME="${PROC_NAME:-java}"
-
-DAEMON="$DAEMON"
-DESC="$DESC"
-EXEC_PATH="$EXEC_PATH"
-SVC_USER="$SVC_USER"
-DAEMON_FLAGS="$DAEMON_FLAGS"
-CONF_DIR="$CONF_DIR"
-CONF_FILE="$CONF_FILE"
-LOGFILE="$LOGFILE"
-PIDFILE="$PIDFILE"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="\$LOCKDIR/$DAEMON"
-WORKING_DIR="${WORKING_DIR:-~/}"
-
-install -d -m 0755 -o $SVC_USER -g $SVC_USER $(dirname $PIDFILE) 1>/dev/null 2>&1 || :
-[ -d "\$LOCKDIR" ] || install -d -m 0755 \$LOCKDIR 1>/dev/null 2>&1 || :
-__EOT__
-
-generate_functions
-generate_start
-generate_stop
-
-cat <<'__EOT__'
-restart() {
-  stop
-  start
-}
-
-checkstatusofproc(){
-  pidofproc -p $PIDFILE $PROC_NAME > /dev/null
-}
-
-checkstatus(){
-  checkstatusofproc
-  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 || :
-}
-
-check_for_root() {
-  if [ $(id -ur) -ne 0 ]; then
-    echo 'Error: root user required'
-    echo
-    exit 1
-  fi
-}
-
-service() {
-  case "$1" in
-    start)
-      check_for_root
-      start
-      ;;
-    stop)
-      check_for_root
-      stop
-      ;;
-    status)
-      checkstatus
-      RETVAL=$?
-      ;;
-    restart|force-reload)
-      check_for_root
-      restart
-      ;;
-    condrestart|try-restart)
-      check_for_root
-      condrestart
-      ;;
-__EOT__
-
-generate_extra_commands
-
-cat <<'__EOT__'
-  esac
-}
-
-service "$@"
-
-exit $RETVAL
-__EOT__
diff --git a/hbase-assembly/rpm-build/sources/regionserver-init.d.tpl b/hbase-assembly/rpm-build/sources/regionserver-init.d.tpl
deleted file mode 100644
index dedfa526c511..000000000000
--- a/hbase-assembly/rpm-build/sources/regionserver-init.d.tpl
+++ /dev/null
@@ -1,446 +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 file is used to run multiple instances of certain HBase daemons using init scripts.
-# It replaces the local-regionserver.sh and local-master.sh scripts for Bigtop packages.
-# By default, this script runs a single daemon normally. If offsets are provided, additional
-# daemons are run, identified by the offset in log and pid files, and listening on the default
-# port + the offset. Offsets can be provided as arguments when invoking init scripts directly:
-#
-#     /etc/init.d/hbase-@HBASE_DAEMON@ start 1 2 3 4
-#
-# or you can list the offsets to run in /etc/init.d/@HBASE_DAEMON@_offsets:
-#
-#    echo "@HBASE_DAEMON@_OFFSETS='1 2 3 4' >> /etc/default/hbase"
-#    sudo service hbase-$HBASE_DAEMON@ start
-#
-# Offsets specified on the command-line always override the offsets file. If no offsets are
-# specified on the command-line when stopping or restarting daemons, all running instances of the
-# daemon are stopped (regardless of the contents of the offsets file).
-
-# chkconfig: @CHKCONFIG@
-# description: Summary: HBase is the Hadoop database. Use it when you need random, realtime read/write access to your Big Data. This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters of commodity hardware.
-# processname: HBase
-#
-### BEGIN INIT INFO
-# Provides:          hbase-@HBASE_DAEMON@
-# Required-Start:    $network $local_fs $remote_fs
-# Required-Stop:     $remote_fs
-# Should-Start:      $named
-# Should-Stop:
-# Default-Start:     @INIT_DEFAULT_START@
-# Default-Stop:      @INIT_DEFAULT_STOP@
-# Short-Description: Hadoop HBase @HBASE_DAEMON@ daemon
-### END INIT INFO
-
-DEFAULTS_DIR=${DEFAULTS_DIR-/etc/default}
-[ -n "${DEFAULTS_DIR}" -a -r ${DEFAULTS_DIR}/hadoop ] && . ${DEFAULTS_DIR}/hadoop
-[ -n "${DEFAULTS_DIR}" -a -r ${DEFAULTS_DIR}/hbase ] && . ${DEFAULTS_DIR}/hbase
-
-# Our default HBASE_HOME, HBASE_PID_DIR and HBASE_CONF_DIR
-export HBASE_HOME=${HBASE_HOME:-/usr/lib/hbase}
-export HBASE_PID_DIR=${HBASE_PID_DIR:-/var/run/hbase}
-export HBASE_LOG_DIR=${HBASE_LOG_DIR:-/var/log/hbase}
-
-install -d -m 0755 -o hbase -g hbase ${HBASE_PID_DIR}
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON_SCRIPT=$HBASE_HOME/bin/hbase-daemon.sh
-NAME=hbase-@HBASE_DAEMON@
-DESC="Hadoop HBase @HBASE_DAEMON@ daemon"
-PID_FILE=$HBASE_PID_DIR/hbase-hbase-@HBASE_DAEMON@.pid
-CONF_DIR=/etc/hbase/conf
-
-DODTIME=3                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
-
-UPPERCASE_HBASE_DAEMON=$(echo @HBASE_DAEMON@ | tr '[:lower:]' '[:upper:]')
-
-ALL_DAEMONS_RUNNING=0
-NO_DAEMONS_RUNNING=1
-SOME_OFFSET_DAEMONS_FAILING=2
-INVALID_OFFSETS_PROVIDED=3
-
-# These limits are not easily configurable - they are enforced by HBase
-if [ "@HBASE_DAEMON@" == "master" ] ; then
-    FIRST_PORT=60000
-    FIRST_INFO_PORT=60010
-    OFFSET_LIMIT=10
-elif [ "@HBASE_DAEMON@" == "regionserver" ] ; then
-    FIRST_PORT=60200
-    FIRST_INFO_PORT=60300
-    OFFSET_LIMIT=100
-fi
-
-validate_offsets() {
-    for OFFSET in $1; do
-        if [[ ! $OFFSET =~ ^((0)|([1-9][0-9]{0,2}))$ ]]; then
-            echo "ERROR: All offsets must be positive integers (no leading zeros, max $OFFSET_LIMIT)"
-            exit $INVALID_OFFSETS_PROVIDED
-        fi
-        if [ ${OFFSET} -lt 0 ] ; then
-            echo "ERROR: Cannot start @HBASE_DAEMON@ with negative offset" >&2
-            exit $INVALID_OFFSETS_PROVIDED
-        fi
-        if [ ${OFFSET} -ge ${OFFSET_LIMIT} ] ; then
-            echo "ERROR: Cannot start @HBASE_DAEMON@ with offset higher than $OFFSET_LIMIT" >&2
-            exit $INVALID_OFFSETS_PROVIDED
-        fi
-    done
-}
-
-offset_pidfile() {
-    echo $HBASE_PID_DIR/hbase-hbase-$1-@HBASE_DAEMON@.pid
-}
-
-OFFSETS_FROM_CLI="${*:2}"
-validate_offsets "$OFFSETS_FROM_CLI"
-if [ -n "$(eval echo \${${UPPERCASE_HBASE_DAEMON}_OFFSETS})" ] ; then
-    OFFSETS_FROM_DEFAULT="$(eval echo \${${UPPERCASE_HBASE_DAEMON}_OFFSETS})"
-    validate_offsets "$OFFSETS_FROM_DEFAULT"
-fi
-OFFSET_PID_FILES="`ls $HBASE_PID_DIR/hbase-hbase-*-@HBASE_DAEMON@.pid 2>/dev/null`"
-if [ -n "$OFFSET_PID_FILES" ] ; then
-    OFFSETS_FROM_PIDS=`echo "$OFFSET_PID_FILES" | sed "s#$HBASE_PID_DIR/hbase-hbase-##" | sed "s#-.*##" | tr '\n' ' '`
-fi
-
-multi_hbase_daemon_check_pidfiles() {
-  if [ -z "$OFFSETS_FROM_PIDS" ] ; then
-    return $NO_DAEMONS_RUNNING
-  fi
-  if [ -n "$OFFSETS_FROM_CLI" ] ; then
-    OFFSETS="$OFFSETS_FROM_CLI"
-  else
-    OFFSETS="$OFFSETS_FROM_PIDS"
-  fi
-
-  RESULT=$ALL_DAEMONS_RUNNING
-  for OFFSET in $OFFSETS; do
-    echo -n "HBase @HBASE_DAEMON@ $OFFSET: "
-    if hbase_check_pidfile `offset_pidfile $OFFSET` ; then
-      echo "running"
-    else
-      echo "not running"
-      RESULT=$SOME_OFFSET_DAEMONS_FAILING
-    fi
-  done
-  return $RESULT
-}
-
-multi_hbase_daemon_stop_pidfiles() {
-  if [ -z "$OFFSETS_FROM_PIDS" ] ; then
-    return $NO_DAEMONS_RUNNING
-  fi
-  if [ -n "$OFFSETS_FROM_CLI" ] ; then
-    OFFSETS="$OFFSETS_FROM_CLI"
-  else
-    OFFSETS="$OFFSETS_FROM_PIDS"
-  fi
-
-  RESULT=$NO_DAEMONS_RUNNING
-  for OFFSET in $OFFSETS; do
-    echo -n "Forcefully stopping HBase @HBASE_DAEMON@ $OFFSET: "
-    PID_FILE=`offset_pidfile $OFFSET`
-    hbase_stop_pidfile $PID_FILE
-    if hbase_check_pidfile $PID_FILE ; then
-      echo "ERROR."
-    else
-      echo "OK."
-      rm -f $PID_FILE
-    fi
-  done
-  return $RESULT
-}
-
-# Starts and stops multiple instances of HBase daemons
-multi_hbase_daemon() {
-    COMMAND=$1
-    OFFSETS="$OFFSETS_FROM_CLI"
-    if [ "$COMMAND" == "start" ] ; then
-        ACTION="Starting"
-        RUNNING="OK"
-        STOPPED="ERROR"
-        if [ -z "$OFFSETS_FROM_CLI" ] ; then
-            OFFSETS="$OFFSETS_FROM_DEFAULT"
-        fi
-    elif [ "$COMMAND" == "stop" ] ; then
-        ACTION="Stopping"
-        RUNNING="ERROR"
-        STOPPED="OK"
-        if [ -z "$OFFSETS_FROM_CLI" ] ; then
-            OFFSETS="$OFFSETS_FROM_PIDS"
-        fi
-    else
-        echo "ERROR: Illegal command: $COMMAND"
-        exit 1
-    fi
-
-    for OFFSET in ${OFFSETS} ; do
-
-        export HBASE_${UPPERCASE_HBASE_DAEMON}_OPTS=" "
-
-        echo -n "$ACTION @HBASE_DAEMON@ daemon $OFFSET: "
-        export HBASE_IDENT_STRING="hbase-${OFFSET}"
-        LOG_FILE="$HBASE_LOG_DIR/hbase-$HBASE_IDENT_STRING-@HBASE_DAEMON@-$HOSTNAME.pid"
-        PID_FILE="$HBASE_PID_DIR/hbase-$HBASE_IDENT_STRING-@HBASE_DAEMON@.pid"
-        HBASE_MULTI_ARGS="-D hbase.regionserver.port=`expr ${FIRST_PORT} + $OFFSET` \
-                          -D hbase.regionserver.info.port=`expr ${FIRST_INFO_PORT} + ${OFFSET}`"
-
-        if [ "x$JAVA_TMP_DIR" == "x" ] ; then
-            JAVA_TMP_DIR="/tmp/java_tmp_dir"
-        fi
-        HBASE_TMP_DIR=" -Djava.io.tmpdir=${JAVA_TMP_DIR}/${OFFSET}"
-
-        if [ "x$JMXPORT" != "x" ] ; then
-            HBASE_JMX_PORT=" -Dcom.sun.management.jmxremote.port=`expr ${JMXPORT} + ${OFFSET}`"
-        fi
-        export HBASE_${UPPERCASE_HBASE_DAEMON}_OPTS="`eval '$'HBASE_${UPPERCASE_HBASE_DAEMON}_OPTS`$HBASE_TMP_DIR$HBASE_JMX_PORT"
-
-        hbase_check_pidfile $PID_FILE
-        STATUS=$?
-        if [[ "$STATUS" == "0" && "$COMMAND" == "start" ]] ; then
-            echo "Already running"
-            continue
-        elif [[ "$STATUS" != "0" && "$COMMAND" == "stop" ]] ; then
-            rm -f $PID_FILE
-            echo "Already stopped"
-            continue
-        fi
-        runuser -s /bin/bash hbase -c "${DAEMON_SCRIPT} ${COMMAND} regionserver ${HBASE_MULTI_ARGS} >> ${LOG_FILE}"
-        if [[ "$COMMAND" == "stop" ]] ; then
-            rm -f $PID_FILE
-        fi
-        if hbase_check_pidfile $PID_FILE ; then
-            echo "$RUNNING"
-        else
-            echo "$STOPPED"
-        fi
-    done
-    return 0
-}
-
-# Checks if the given pid represents a live process.
-# Returns 0 if the pid is a live process, 1 otherwise
-hbase_is_process_alive() {
-  local pid="$1"
-  ps -fp $pid | grep $pid | grep @HBASE_DAEMON@ > /dev/null 2>&1
-}
-
-# Check if the process associated to a pidfile is running.
-# Return 0 if the pidfile exists and the process is running, 1 otherwise
-hbase_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"
-
-  hbase_is_process_alive $pid
-}
-
-# Kill the process associated to a pidfile
-hbase_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 hbase_process_kill "$pid" 15; then
-      rm $pidfile
-      return 0
-   fi
-
-   # Otherwise try the hard way
-   if hbase_process_kill "$pid" 9; then
-      rm $pidfile
-      return 0
-   fi
-
-   return 1
-}
-
-hbase_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 1 2 3 4 5 6 7 8 9 10; do
-        if hbase_is_process_alive "$pid"; then
-         # Success
-            return 0
-        fi
-
-        sleep 1
-    done
-
-   # Timeout
-    return 1
-}
-
-start() {
-    if [ -n "${OFFSETS_FROM_CLI}${OFFSETS_FROM_DEFAULT}" ] ; then
-        if hbase_check_pidfile $PID_FILE ; then
-            echo "$NAME has already been started - cannot start other @HBASE_DAEMON@ daemons."
-            return 1
-        fi
-        multi_hbase_daemon "start"
-        return $?
-    fi
-    multi_hbase_daemon_check_pidfiles > /dev/null
-    if [ "$?" != "$NO_DAEMONS_RUNNING" ] ; then
-      echo "Cannot start $NAME - other @HBASE_DAEMON@ daemons have already been started."
-      return 1
-    fi
-    echo -n "Starting $DESC: "
-    runuser -s /bin/bash hbase -c "$DAEMON_SCRIPT start @HBASE_DAEMON@"
-    if hbase_check_pidfile $PID_FILE ; then
-        echo "$NAME."
-        return $ALL_DAEMONS_RUNNING
-    else
-        echo "ERROR."
-        return $NO_DAEMONS_RUNNING
-    fi
-}
-stop() {
-    if [ -n "${OFFSETS_FROM_CLI}${OFFSETS_FROM_PIDS}" ] ; then
-        multi_hbase_daemon "stop"
-        return "$?"
-    fi
-
-    echo -n "Stopping $DESC: "
-    runuser -s /bin/bash hbase -c "$DAEMON_SCRIPT stop @HBASE_DAEMON@"
-    if hbase_check_pidfile $PID_FILE ; then
-        echo "ERROR."
-        return 1
-    else
-        echo "$NAME."
-        return 0
-    fi
-}
-
-force_stop() {
-    MULTI_HBASE_DAEMON_STATUS_TEXT=`multi_hbase_daemon_check_pidfiles`
-    MULTI_HBASE_DAEMON_STATUS=$?
-    if [ "$MULTI_HBASE_DAEMON_STATUS" == "$NO_DAEMONS_RUNNING" ] ; then
-        echo -n "Forcefully stopping $DESC: "
-        hbase_stop_pidfile $PID_FILE
-        if hbase_check_pidfile $PID_FILE ; then
-            echo " ERROR."
-        else
-            echo "$NAME."
-        fi
-    else
-        multi_hbase_daemon_stop_pidfiles
-    fi
-}
-
-force_reload() {
-  # check wether $DAEMON is running. If so, restart
-  hbase_check_pidfile $PID_FILE && $0 restart $OFFSETS_FROM_CLI
-}
-
-restart() {
-    echo -n "Restarting $DESC: "
-    $0 stop
-    [ -n "$DODTIME" ] && sleep $DODTIME
-    $0 start $OFFSETS_FROM_CLI
-}
-
-status() {
-    MULTI_HBASE_DAEMON_STATUS_TEXT=`multi_hbase_daemon_check_pidfiles`
-    MULTI_HBASE_DAEMON_STATUS=$?
-    if [ "$MULTI_HBASE_DAEMON_STATUS" == "$NO_DAEMONS_RUNNING" ] ; then
-        echo -n "$NAME is "
-        if hbase_check_pidfile $PID_FILE ;  then
-            echo "running"
-        else
-            echo "not running."
-            return $NO_DAEMONS_RUNNING
-        fi
-    else
-        IFS=''
-        echo $MULTI_HBASE_DAEMON_STATUS_TEXT
-        return $MULTI_HBASE_DAEMON_STATUS
-    fi
-}
-
-condrestart(){
-    status $@ >/dev/null 2>/dev/null
-    DAEMON_STATUS=$?
-    if [ "$DAEMON_STATUS" == "$ALL_DAEMONS_RUNNING" -o "$DAEMON_STATUS" == "$SOME_OFFSET_DAEMONS_FAILING" ] ; then
-        restart $@
-    fi
-}
-
-RETVAL=0
-
-case "$1" in
-  start)
-        start
-        RETVAL=$?
-  ;;
-  stop)
-        stop
-        RETVAL=$?
-  ;;
-  force-stop)
-        force_stop
-        RETVAL=$?
-  ;;
-  force-reload)
-        force_reload
-        RETVAL=$?
-  ;;
-  restart)
-        restart
-        RETVAL=$?
-    ;;
-  condrestart)
-        condrestart
-        RETVAL=$?
-  ;;
-  status)
-        status
-        RETVAL=$?
-    ;;
-  *)
-  N=/etc/init.d/$NAME
-  echo "Usage: $N {start|stop|restart|force-reload|status|force-stop|condrestart}" >&2
-  RETVAL=1
-  ;;
-esac
-
-exit ${RETVAL}
diff --git a/hbase-asyncfs/.blazar.yaml b/hbase-asyncfs/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-asyncfs/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-backup/.blazar.yaml b/hbase-backup/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-backup/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-build-configuration/.blazar.yaml b/hbase-build-configuration/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-build-configuration/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-checkstyle/.blazar.yaml b/hbase-checkstyle/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-checkstyle/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-client/.blazar.yaml b/hbase-client/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-client/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-common/.blazar.yaml b/hbase-common/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-common/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-compression/.blazar.yaml b/hbase-compression/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-compression/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-compression/hbase-compression-aircompressor/.blazar.yaml b/hbase-compression/hbase-compression-aircompressor/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-compression/hbase-compression-aircompressor/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-compression/hbase-compression-brotli/.blazar.yaml b/hbase-compression/hbase-compression-brotli/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-compression/hbase-compression-brotli/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-compression/hbase-compression-lz4/.blazar.yaml b/hbase-compression/hbase-compression-lz4/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-compression/hbase-compression-lz4/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-compression/hbase-compression-snappy/.blazar.yaml b/hbase-compression/hbase-compression-snappy/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-compression/hbase-compression-snappy/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-compression/hbase-compression-xz/.blazar.yaml b/hbase-compression/hbase-compression-xz/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-compression/hbase-compression-xz/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-compression/hbase-compression-zstd/.blazar.yaml b/hbase-compression/hbase-compression-zstd/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-compression/hbase-compression-zstd/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-endpoint/.blazar.yaml b/hbase-endpoint/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-endpoint/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-examples/.blazar.yaml b/hbase-examples/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-examples/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-external-blockcache/.blazar.yaml b/hbase-external-blockcache/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-external-blockcache/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-hadoop-compat/.blazar.yaml b/hbase-hadoop-compat/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-hadoop-compat/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-hadoop2-compat/.blazar.yaml b/hbase-hadoop2-compat/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-hadoop2-compat/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-hbtop/.blazar.yaml b/hbase-hbtop/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-hbtop/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-http/.blazar.yaml b/hbase-http/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-http/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-it/.blazar.yaml b/hbase-it/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-it/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-logging/.blazar.yaml b/hbase-logging/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-logging/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-mapreduce/.blazar.yaml b/hbase-mapreduce/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-mapreduce/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-metrics-api/.blazar.yaml b/hbase-metrics-api/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-metrics-api/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-metrics/.blazar.yaml b/hbase-metrics/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-metrics/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-procedure/.blazar.yaml b/hbase-procedure/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-procedure/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-protocol-shaded/.blazar.yaml b/hbase-protocol-shaded/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-protocol-shaded/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-protocol/.blazar.yaml b/hbase-protocol/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-protocol/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-replication/.blazar.yaml b/hbase-replication/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-replication/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-resource-bundle/.blazar.yaml b/hbase-resource-bundle/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-resource-bundle/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-rest/.blazar.yaml b/hbase-rest/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-rest/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-rpm/.blazar.yaml b/hbase-rpm/.blazar.yaml
new file mode 100644
index 000000000000..2b87704311b0
--- /dev/null
+++ b/hbase-rpm/.blazar.yaml
@@ -0,0 +1,28 @@
+buildpack:
+  name: Blazar-Buildpack-RPM
+
+env:
+  RPM_BUILD_COMMAND: ./build.sh
+  DISABLE_CENTOS_6_RPMS: "true"
+  ENABLE_CENTOS_8_RPMS: "true"
+   # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: ""
+  SET_VERSION: ""
+  HBASE_VERSION: ""
+  PKG_RELEASE: ""
+  FULL_BUILD_VERSION: ""
+
+depends:
+  - hbase
+
+before:
+  - description: "Prepare build environment"
+    commands:
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+stepActivation:
+  uploadRpms:
+    branchRegexes: ['.*']
diff --git a/hbase-rpm/build.sh b/hbase-rpm/build.sh
new file mode 100755
index 000000000000..b527ca732913
--- /dev/null
+++ b/hbase-rpm/build.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+set -e
+set -x
+
+ROOT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+
+for iv in HBASE_VERSION SET_VERSION PKG_RELEASE; do
+    if [[ "X${!iv}" = "X" ]]; then
+        echo "Must specifiy $iv"
+        exit 1
+    fi
+done
+
+# Setup build dir
+BUILD_DIR="${ROOT_DIR}/build"
+rm -rf $BUILD_DIR
+mkdir -p ${BUILD_DIR}/{SOURCES,SPECS,RPMS}
+cp -a $ROOT_DIR/sources/* ${BUILD_DIR}/SOURCES/
+cp $ROOT_DIR/hbase.spec ${BUILD_DIR}/SPECS/
+
+# Download bin tar built by hbase-assembly
+SOURCES_DIR=$BUILD_DIR/SOURCES
+mvn dependency:copy \
+    -Dartifact=org.apache.hbase:hbase-assembly:${SET_VERSION}:tar.gz:bin \
+    -DoutputDirectory=$SOURCES_DIR \
+    -DlocalRepositoryDirectory=$SOURCES_DIR \
+    -Dtransitive=false
+INPUT_TAR=`ls -d $SOURCES_DIR/hbase-assembly-*.tar.gz`
+
+if [[ $HBASE_VERSION == *"-SNAPSHOT" ]]; then
+    # unreleased verion. do i want to denote that in the rpm release somehow?
+    # it can't be in the version, so strip here
+    HBASE_VERSION=${HBASE_VERSION//-SNAPSHOT/}
+fi
+
+rpmbuild \
+    --define "_topdir $BUILD_DIR" \
+    --define "input_tar $INPUT_TAR" \
+    --define "hbase_version ${HBASE_VERSION}" \
+    --define "maven_version ${SET_VERSION}" \
+    --define "release ${PKG_RELEASE}%{?dist}" \
+    -bb \
+    $BUILD_DIR/SPECS/hbase.spec
+
+if [[ -d $RPMS_OUTPUT_DIR ]]; then
+    mkdir -p $RPMS_OUTPUT_DIR
+
+    # Move rpms to output dir for upload
+
+    find ${BUILD_DIR}/RPMS -name "*.rpm" -exec mv {} $RPMS_OUTPUT_DIR/ \;
+fi
diff --git a/hbase-assembly/rpm-build/hbase.spec b/hbase-rpm/hbase.spec
similarity index 57%
rename from hbase-assembly/rpm-build/hbase.spec
rename to hbase-rpm/hbase.spec
index 7ddad41cae01..107c92636f06 100644
--- a/hbase-assembly/rpm-build/hbase.spec
+++ b/hbase-rpm/hbase.spec
@@ -11,10 +11,8 @@
 %define conf_hbase %{hbase_home}/conf
 %define logs_hbase %{hbase_home}/logs
 %define pids_hbase %{hbase_home}/pids
-#%define webapps_hbase %{hbase_home}/hbase-webapps
 %define man_dir %{_mandir}
 %define hbase_username hbase
-%define hbase_services master regionserver thrift thrift2 rest
 %define hadoop_home /usr/lib/hadoop
 %define zookeeper_home /usr/lib/zookeeper
 
@@ -48,15 +46,10 @@ BuildArch: noarch
 Summary: HBase is the Hadoop database. Use it when you need random, realtime read/write access to your Big Data. This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters of commodity hardware.
 URL: http://hbase.apache.org/
 Group: Systems/Daemons
-Buildroot: %{_topdir}/INSTALL/hbase-%{version}
+Buildroot: %{_topdir}/INSTALL/hbase-%{maven_version}
 License: ASL 2.0
 Source0: %{input_tar}
 Source1: install_hbase.sh
-Source2: hbase.svc
-Source3: init.d.tmpl
-Source4: hbase.default
-Source5: hbase.nofiles.conf
-Source6: regionserver-init.d.tpl
 
 Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
 Requires: hadoop >= %{hadoop_major_version}
@@ -75,72 +68,19 @@ HBase is an open-source, distributed, column-oriented store modeled after Google
     * Extensible jruby-based (JIRB) shell
     * Support for exporting metrics via the Hadoop metrics subsystem to files or Ganglia; or via JMX
 
-%package master
-Summary: The Hadoop HBase master Server.
-Group: System/Daemons
-Requires: %{name} >= %{hbase_major_version}
-Requires(pre): %{name} >= %{hbase_major_version}
-
-%description master
-HMaster is the "coordinator server" for a HBase. There is only one HMaster for a single HBase deployment.
-
-%package regionserver
-Summary: The Hadoop HBase RegionServer server.
-Group: System/Daemons
-Requires: %{name} >= %{hbase_major_version}
-Requires(pre): %{name} >= %{hbase_major_version}
-
-%description regionserver
-HRegionServer makes a set of HRegions available to clients. It checks in with the HMaster. There are many HRegionServers in a single HBase deployment.
-
-%package thrift
-Summary: The Hadoop HBase Thrift Interface
-Group: System/Daemons
-Requires: %{name} >= %{hbase_major_version}
-Requires(pre): %{name} >= %{hbase_major_version}
-
-%description thrift
-ThriftServer - this class starts up a Thrift server which implements the Hbase API specified in the Hbase.thrift IDL file.
-"Thrift is a software framework for scalable cross-language services development. It combines a powerful software stack with a code generation engine to build services that work efficiently and seamlessly between C++, Java, Python, PHP, and Ruby. Thrift was developed at Facebook, and we are now releasing it as open source." For additional information, see http://developers.facebook.com/thrift/. Facebook has announced their intent to migrate Thrift into Apache Incubator.
-
-%package thrift2
-Summary: The Hadoop HBase Thrift2 Interface
-Group: System/Daemons
-Requires: %{name} >= %{hbase_major_version}
-Requires(pre): %{name} >= %{hbase_major_version}
-
-%description thrift2
-Thrift2 Server to supersede original Thrift Server.
-Still under development. https://issues.apache.org/jira/browse/HBASE-8818
-
-%package rest
-Summary: The Apache HBase REST gateway
-Group: System/Daemons
-Requires: %{name} >= %{hbase_major_version}
-Requires(pre): %{name} >= %{hbase_major_version}
-
-%description rest
-The Apache HBase REST gateway
-
 %prep
-%setup -n hbase-%{hbase_version}
+%setup -n hbase-%{maven_version}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
 bash %{SOURCE1} \
-	--mvn-target-dir=%{mvn_target_dir} \
+	--input-tar=%{SOURCE0} \
     --doc-dir=%{doc_hbase} \
     --conf-dir=%{etc_hbase_conf_dist} \
 	--prefix=$RPM_BUILD_ROOT
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
 
-%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default/
-%__install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/etc/default/hbase
-
-%__install -d -m 0755 $RPM_BUILD_ROOT/etc/security/limits.d
-%__install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/etc/security/limits.d/hbase.nofiles.conf
-
 %__install -d  -m 0755  %{buildroot}/%{_localstatedir}/log/hbase
 ln -s %{_localstatedir}/log/hbase %{buildroot}/%{logs_hbase}
 
@@ -149,25 +89,6 @@ ln -s %{_localstatedir}/run/hbase %{buildroot}/%{pids_hbase}
 
 %__install -d  -m 0755  %{buildroot}/%{_localstatedir}/lib/hbase
 
-for service in %{hbase_services}
-do
-    init_file=$RPM_BUILD_ROOT/%{initd_dir}/hbase-${service}
-    if [[ "$service" = "regionserver" ]] ; then
-        # Region servers start from a different template that allows
-        # them to run multiple concurrent instances of the daemon
-        %__cp %{SOURCE6} $init_file
-        %__sed -i -e "s|@INIT_DEFAULT_START@|3 4 5|" $init_file
-        %__sed -i -e "s|@INIT_DEFAULT_STOP@|0 1 2 6|" $init_file
-        %__sed -i -e "s|@CHKCONFIG@|345 87 13|" $init_file
-        %__sed -i -e "s|@HBASE_DAEMON@|${service}|" $init_file
-    else
-        %__sed -e "s|@HBASE_DAEMON@|${service}|" %{SOURCE2} > ${RPM_SOURCE_DIR}/hbase-${service}.node
-        bash %{SOURCE3} ${RPM_SOURCE_DIR}/hbase-${service}.node rpm $init_file
-    fi
-
-    chmod 755 $init_file
-done
-
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 
 # Pull hadoop from its packages
@@ -200,26 +121,11 @@ getent passwd hbase 2>&1 > /dev/null || /usr/sbin/useradd -c "HBase" -s /sbin/no
 %dir %{_localstatedir}/lib/hbase
 
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/default/hbase
-%config(noreplace) /etc/security/limits.d/hbase.nofiles.conf
 %{hbase_home}
 %{hbase_home}/hbase-*.jar
-#%{webapps_hbase}
 /usr/bin/hbase
 %config(noreplace) %{etc_hbase_conf_dist}
 
 # files from doc package
 %defattr(-,root,root)
 %doc %{doc_hbase}/
-
-%define service_macro() \
-%files %1 \
-%attr(0755,root,root)/%{initd_dir}/%{name}-%1 \
-%post %1 \
-chkconfig --add %{name}-%1
-
-%service_macro master
-%service_macro thrift
-%service_macro thrift2
-%service_macro regionserver
-%service_macro rest
diff --git a/hbase-assembly/rpm-build/sources/hbase.1 b/hbase-rpm/sources/hbase.1
similarity index 100%
rename from hbase-assembly/rpm-build/sources/hbase.1
rename to hbase-rpm/sources/hbase.1
diff --git a/hbase-assembly/rpm-build/sources/install_hbase.sh b/hbase-rpm/sources/install_hbase.sh
similarity index 90%
rename from hbase-assembly/rpm-build/sources/install_hbase.sh
rename to hbase-rpm/sources/install_hbase.sh
index 70d1b9603d89..95265d2100c8 100755
--- a/hbase-assembly/rpm-build/sources/install_hbase.sh
+++ b/hbase-rpm/sources/install_hbase.sh
@@ -45,7 +45,7 @@ OPTS=$(getopt \
   -l 'bin-dir:' \
   -l 'examples-dir:' \
   -l 'conf-dir:' \
-  -l 'mvn-target-dir:' -- "$@")
+  -l 'input-tar:' -- "$@")
 
 if [ $? != 0 ] ; then
     usage
@@ -57,8 +57,8 @@ while true ; do
         --prefix)
         PREFIX=$2 ; shift 2
         ;;
-        --mvn-target-dir)
-        MVN_TARGET_DIR=$2 ; shift 2
+        --input-tar)
+        INPUT_TAR=$2 ; shift 2
         ;;
         --doc-dir)
         DOC_DIR=$2 ; shift 2
@@ -86,7 +86,7 @@ while true ; do
     esac
 done
 
-for var in PREFIX MVN_TARGET_DIR ; do
+for var in PREFIX INPUT_TAR ; do
   if [ -z "$(eval "echo \$$var")" ]; then
     echo Missing param: $var
     usage
@@ -111,7 +111,7 @@ if [ -z "$version_part" ]; then
   version_part=$HBASE_VERSION
 fi
 
-tar -C $EXTRACT_DIR --strip-components=1 -xzf $MVN_TARGET_DIR/hbase-$version_part-bin.tar.gz
+tar -C $EXTRACT_DIR --strip-components=1 -xzf $INPUT_TAR
 
 # we do not need the shaded clients in our rpm. they bloat the size and cause classpath issues for hbck2.
 rm -rf $EXTRACT_DIR/lib/shaded-clients
@@ -136,10 +136,9 @@ else
   echo "Doc generation is currently disabled in our RPM build. If this is an issue, it should be possible to enable them with some work. See https://git.hubteam.com/HubSpot/apache-hbase/blob/hubspot-2/rpm/sources/do-component-build#L17-L24 for details." > $PREFIX/$DOC_DIR/README.txt
 fi
 
-#cp -a $EXTRACT_DIR/hbase-webapps $PREFIX/$LIB_DIR
-
 cp -a $EXTRACT_DIR/conf $PREFIX/$CONF_DIR
 cp -a $EXTRACT_DIR/bin/* $PREFIX/$BIN_DIR
+
 # Purge scripts that don't work with packages
 for file in rolling-restart.sh graceful_stop.sh local-regionservers.sh \
             master-backup.sh regionservers.sh zookeepers.sh hbase-daemons.sh \
@@ -147,8 +146,6 @@ for file in rolling-restart.sh graceful_stop.sh local-regionservers.sh \
   rm -f $PREFIX/$BIN_DIR/$file
 done
 
-cp $EXTRACT_DIR/../hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift $PREFIX/$THRIFT_DIR/hbase1.thrift
-cp $EXTRACT_DIR/../hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift $PREFIX/$THRIFT_DIR/hbase2.thrift
 
 ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
 
diff --git a/hbase-rsgroup/.blazar.yaml b/hbase-rsgroup/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-rsgroup/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-server/.blazar.yaml b/hbase-server/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-server/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/.blazar.yaml b/hbase-shaded/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-check-invariants/.blazar.yaml b/hbase-shaded/hbase-shaded-check-invariants/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-check-invariants/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/.blazar.yaml b/hbase-shaded/hbase-shaded-client-byo-hadoop/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-client-byo-hadoop/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-client/.blazar.yaml b/hbase-shaded/hbase-shaded-client/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-client/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-mapreduce/.blazar.yaml b/hbase-shaded/hbase-shaded-mapreduce/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-mapreduce/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-netty-tcnative/.blazar.yaml b/hbase-shaded/hbase-shaded-netty-tcnative/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-netty-tcnative/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-testing-util-tester/.blazar.yaml b/hbase-shaded/hbase-shaded-testing-util-tester/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-testing-util-tester/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-testing-util/.blazar.yaml b/hbase-shaded/hbase-shaded-testing-util/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-testing-util/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/.blazar.yaml b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-shell/.blazar.yaml b/hbase-shell/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-shell/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-testing-util/.blazar.yaml b/hbase-testing-util/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-testing-util/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-thrift/.blazar.yaml b/hbase-thrift/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-thrift/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hbase-zookeeper/.blazar.yaml b/hbase-zookeeper/.blazar.yaml
deleted file mode 100644
index 79dd6763ec60..000000000000
--- a/hbase-zookeeper/.blazar.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-buildpack:
-  name: Blazar-Buildpack-Java
-
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
-# The build environment requires environment variables to be explicitly defined before they may
-# be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
-# throughout a build
-env:
-  MAVEN_ARGS: ""
-  SET_VERSION: ""
-  HBASE_VERSION: ""
-  PKG_RELEASE: ""
-  FULL_BUILD_VERSION: ""
-
-before:
-  - description: "Prepare build environment"
-    commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh
diff --git a/hubspot-client-bundles/.blazar.yaml b/hubspot-client-bundles/.blazar.yaml
index 07de2a4f342f..a33edb3ed53a 100644
--- a/hubspot-client-bundles/.blazar.yaml
+++ b/hubspot-client-bundles/.blazar.yaml
@@ -1,16 +1,12 @@
 buildpack:
   name: Blazar-Buildpack-Java
 
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
 env:
-  MAVEN_ARGS: ""
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: ""
   SET_VERSION: ""
   HBASE_VERSION: ""
   PKG_RELEASE: ""
@@ -19,4 +15,9 @@ env:
 before:
   - description: "Prepare build environment"
     commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh cdh5
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hbase
+provides:
+  - hubspot-client-bundles
diff --git a/hubspot-client-bundles/.build-jdk8 b/hubspot-client-bundles/.build-jdk11
similarity index 100%
rename from hubspot-client-bundles/.build-jdk8
rename to hubspot-client-bundles/.build-jdk11
diff --git a/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml
index dab24864773e..d7e74cfc88a7 100644
--- a/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml
+++ b/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml
@@ -1,16 +1,12 @@
 buildpack:
   name: Blazar-Buildpack-Java
 
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
 env:
-  MAVEN_ARGS: ""
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: ""
   SET_VERSION: ""
   HBASE_VERSION: ""
   PKG_RELEASE: ""
@@ -20,3 +16,10 @@ before:
   - description: "Prepare build environment"
     commands:
       - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hubspot-client-bundles
+  - hbase-client-bundle
+  - hbase-mapreduce-bundle
+provides:
+  - hbase-backup-restore-bundle
diff --git a/hubspot-client-bundles/hbase-backup-restore-bundle/.build-jdk8 b/hubspot-client-bundles/hbase-backup-restore-bundle/.build-jdk11
similarity index 100%
rename from hubspot-client-bundles/hbase-backup-restore-bundle/.build-jdk8
rename to hubspot-client-bundles/hbase-backup-restore-bundle/.build-jdk11
diff --git a/hubspot-client-bundles/hbase-backup-restore-bundle/pom.xml b/hubspot-client-bundles/hbase-backup-restore-bundle/pom.xml
index 21f7bddefef8..fa3c45319706 100644
--- a/hubspot-client-bundles/hbase-backup-restore-bundle/pom.xml
+++ b/hubspot-client-bundles/hbase-backup-restore-bundle/pom.xml
@@ -6,7 +6,6 @@
     <groupId>com.hubspot.hbase</groupId>
     <artifactId>hubspot-client-bundles</artifactId>
     <version>${revision}</version>
-    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>hbase-backup-restore-bundle</artifactId>
@@ -20,10 +19,6 @@
       <groupId>com.hubspot.hbase</groupId>
       <artifactId>hbase-mapreduce-bundle</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-protocol-shaded</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-backup</artifactId>
@@ -59,10 +54,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-common</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml
index 07de2a4f342f..d9460df77009 100644
--- a/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml
+++ b/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml
@@ -1,16 +1,12 @@
 buildpack:
   name: Blazar-Buildpack-Java
 
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
 env:
-  MAVEN_ARGS: ""
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: ""
   SET_VERSION: ""
   HBASE_VERSION: ""
   PKG_RELEASE: ""
@@ -19,4 +15,10 @@ env:
 before:
   - description: "Prepare build environment"
     commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh cdh5
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hubspot-client-bundles
+provides:
+  - hbase-client-bundle
+
diff --git a/hubspot-client-bundles/hbase-client-bundle/.build-jdk8 b/hubspot-client-bundles/hbase-client-bundle/.build-jdk11
similarity index 100%
rename from hubspot-client-bundles/hbase-client-bundle/.build-jdk8
rename to hubspot-client-bundles/hbase-client-bundle/.build-jdk11
diff --git a/hubspot-client-bundles/hbase-client-bundle/pom.xml b/hubspot-client-bundles/hbase-client-bundle/pom.xml
index 7eac089a0f71..5c9b9100fcfe 100644
--- a/hubspot-client-bundles/hbase-client-bundle/pom.xml
+++ b/hubspot-client-bundles/hbase-client-bundle/pom.xml
@@ -6,7 +6,6 @@
     <groupId>com.hubspot.hbase</groupId>
     <artifactId>hubspot-client-bundles</artifactId>
     <version>${revision}</version>
-    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>hbase-client-bundle</artifactId>
diff --git a/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml
index 07de2a4f342f..9d3fb688ef08 100644
--- a/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml
+++ b/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml
@@ -1,16 +1,12 @@
 buildpack:
   name: Blazar-Buildpack-Java
 
-# Note: this blazar yaml has been copied to all of the maven submodules (EXCEPT hbase-assembly) so
-# that they can be properly configured. If you make changes to this, you will need to make sure all
-# submodules are also updated accordingly. If you added a new submodule, you'll need to make sure
-# it gets a copy of this .blazar.yaml. In either case, use copy_blazar_yaml.sh to copy to all
-# subdirs containing a pom.xml.
-# Make sure to also check hbase-assembly/.blazar.yaml to see if any changes should be added there as well.
-# Prefer making changes to prepare_environment.sh instead, if possible.
-
 env:
-  MAVEN_ARGS: ""
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: ""
   SET_VERSION: ""
   HBASE_VERSION: ""
   PKG_RELEASE: ""
@@ -19,4 +15,10 @@ env:
 before:
   - description: "Prepare build environment"
     commands:
-      - $WORKSPACE/build-scripts/prepare_environment.sh cdh5
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hubspot-client-bundles
+  - hbase-client-bundle
+provides:
+  - hbase-mapreduce-bundle
diff --git a/hubspot-client-bundles/hbase-mapreduce-bundle/.build-jdk8 b/hubspot-client-bundles/hbase-mapreduce-bundle/.build-jdk11
similarity index 100%
rename from hubspot-client-bundles/hbase-mapreduce-bundle/.build-jdk8
rename to hubspot-client-bundles/hbase-mapreduce-bundle/.build-jdk11
diff --git a/hubspot-client-bundles/hbase-mapreduce-bundle/pom.xml b/hubspot-client-bundles/hbase-mapreduce-bundle/pom.xml
index 63417f06fb26..7050eca51a7b 100644
--- a/hubspot-client-bundles/hbase-mapreduce-bundle/pom.xml
+++ b/hubspot-client-bundles/hbase-mapreduce-bundle/pom.xml
@@ -6,7 +6,6 @@
     <groupId>com.hubspot.hbase</groupId>
     <artifactId>hubspot-client-bundles</artifactId>
     <version>${revision}</version>
-    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>hbase-mapreduce-bundle</artifactId>
@@ -22,6 +21,54 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-mapreduce</artifactId>
       <exclusions>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-common</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-protocol</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-protocol-shaded</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.protobuf</groupId>
+          <artifactId>protobuf-java</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-gson</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-protobuf</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-unsafe</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-miscellaneous</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-netty</artifactId>
+        </exclusion>
         <!-- unnecessary or conflicting dependencies to exclude from the jar -->
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -49,6 +96,55 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
       <exclusions>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-common</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-protocol</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-protocol-shaded</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.protobuf</groupId>
+          <artifactId>protobuf-java</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-gson</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-protobuf</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-unsafe</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-miscellaneous</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hbase.thirdparty</groupId>
+          <artifactId>hbase-shaded-netty</artifactId>
+        </exclusion>
+
         <!-- unnecessary or conflicting dependencies to exclude from the jar -->
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -88,101 +184,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-core</artifactId>
-      <exclusions>
-        <!--
-        Setting this as scope provided was not effective at eliminating it.
-        Allowing it to come through results in a bunch of problematic jax1
-        deps to come in. Resort to an exclusion.
-        -->
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-yarn-common</artifactId>
-        </exclusion>
-        <!-- unnecessary or conflicting dependencies to exclude from the jar -->
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!--
-    These are all provided by hbase-client-bundle. We set them as scope
-    provided here so that they are excluded from the resulting dependency
-    reduced pom. This should be kept in-sync with the inclusion list
-    in hbase-client-bundle.
-     -->
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-protocol</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-protocol-shaded</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-logging</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase.thirdparty</groupId>
-      <artifactId>hbase-shaded-gson</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase.thirdparty</groupId>
-      <artifactId>hbase-shaded-protobuf</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase.thirdparty</groupId>
-      <artifactId>hbase-unsafe</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase.thirdparty</groupId>
-      <artifactId>hbase-shaded-miscellaneous</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase.thirdparty</groupId>
-      <artifactId>hbase-shaded-netty</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hubspot-client-bundles/pom.xml b/hubspot-client-bundles/pom.xml
index bebfd19ce431..8565d90c594f 100644
--- a/hubspot-client-bundles/pom.xml
+++ b/hubspot-client-bundles/pom.xml
@@ -2,15 +2,9 @@
 <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.hbase</groupId>
-    <artifactId>hbase-build-configuration</artifactId>
-    <version>${revision}</version>
-    <relativePath>../hbase-build-configuration</relativePath>
-  </parent>
-
   <groupId>com.hubspot.hbase</groupId>
   <artifactId>hubspot-client-bundles</artifactId>
+  <version>${revision}</version>
   <packaging>pom</packaging>
   <name>Bundled versions of the hbase client</name>
 
@@ -22,14 +16,11 @@
 
   <properties>
     <shade.prefix>org.apache.hadoop.hbase.shaded</shade.prefix>
-    <!--
-      zookeeper version should be relatively compatible, and the default version
-      brings in netty-resolver 4.1.45.Final, which is not compatible with our default netty version
-      -->
-    <zookeeper.version>3.4.14</zookeeper.version>
+    <zookeeper.version>3.6.3-shaded-SNAPSHOT</zookeeper.version>
   </properties>
 
   <dependencyManagement>
+    <!-- local project deps -->
     <dependencies>
       <dependency>
         <groupId>com.hubspot.hbase</groupId>
@@ -52,6 +43,194 @@
         <artifactId>hbase-backup-restore-bundle</artifactId>
         <version>${project.version}</version>
       </dependency>
+
+      <!-- hbase-provided deps -->
+      <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>${zookeeper.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-shaded-netty-tcnative</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-client</artifactId>
+        <version>${project.version}</version>
+        <!-- we repeat the same exclusions here in each of the below modules -->
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-guice</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.github.pjfanning</groupId>
+            <artifactId>jersey-json</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.google.j2objc</groupId>
+            <artifactId>j2objc-annotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-server</artifactId>
+        <version>${project.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-guice</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.github.pjfanning</groupId>
+            <artifactId>jersey-json</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.google.j2objc</groupId>
+            <artifactId>j2objc-annotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-mapreduce</artifactId>
+        <version>${project.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-guice</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.github.pjfanning</groupId>
+            <artifactId>jersey-json</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.google.j2objc</groupId>
+            <artifactId>j2objc-annotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-endpoint</artifactId>
+        <version>${project.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-guice</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.github.pjfanning</groupId>
+            <artifactId>jersey-json</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.google.j2objc</groupId>
+            <artifactId>j2objc-annotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-backup</artifactId>
+        <version>${project.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-guice</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.github.pjfanning</groupId>
+            <artifactId>jersey-json</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.google.j2objc</groupId>
+            <artifactId>j2objc-annotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/pom.xml b/pom.xml
index 7a4f32a83ed8..57e3a5d4f1ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1930,11 +1930,6 @@
           <embedBuildProfileDependencies>true</embedBuildProfileDependencies>
           <updatePomFile>true</updatePomFile>
         </configuration>
-        <!--
-          Don't enable flattening for hubspot right now because
-          it messes with hadoop2 deps in our bundles.
-          This is a bit of a hack, but should be resolved once we finally
-          finish hadoop3 client upgrade
         <executions>
           <execution>
             <id>flatten</id>
@@ -1951,7 +1946,6 @@
             <phase>clean</phase>
           </execution>
         </executions>
-        -->
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>