From 5a4656d149a613873c7294cf0c8af89604e44d2b Mon Sep 17 00:00:00 2001 From: ericsun95 <31479694+ericsun95@users.noreply.github.com> Date: Wed, 12 Apr 2023 09:17:27 -0500 Subject: [PATCH] GEOMESA-3274 Fix AWS HBase bootstrap script file references (#2980) Update the bootstrap script with correct scala version and hbase version. Since we drop the support for 2.11 and we are moving towards hbase 2, I just change it to two by default. --- .../geomesa-hbase-tools/bin/bootstrap-geomesa-hbase-aws.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/geomesa-hbase/geomesa-hbase-tools/bin/bootstrap-geomesa-hbase-aws.sh b/geomesa-hbase/geomesa-hbase-tools/bin/bootstrap-geomesa-hbase-aws.sh index f6ea8de2d836..d98b27479465 100644 --- a/geomesa-hbase/geomesa-hbase-tools/bin/bootstrap-geomesa-hbase-aws.sh +++ b/geomesa-hbase/geomesa-hbase-tools/bin/bootstrap-geomesa-hbase-aws.sh @@ -19,7 +19,7 @@ GMUSER=hadoop # todo bootstrap from the current running location and ask the user if they want to # install to /opt/geomesa ? Maybe propmpt with a default of /opt/geomesa similar to # how the maven release plugin works? -GMDIR="/opt/geomesa-hbase_2.11-%%project.version%%" +GMDIR="/opt/geomesa-hbase_%%scala.binary.version%%-%%project.version%%" if [[ ! -d "${GMDIR}" ]]; then echo "Unable to find geomesa directory at ${GMDIR}" @@ -28,7 +28,7 @@ fi echo "Bootstrapping GeoMesa HBase with version %%project.version%% installed at ${GMDIR}" -pip install --upgrade awscli +pip3 install --upgrade awscli if [[ ! -d "/opt" ]]; then echo "Unable to find /opt" @@ -59,7 +59,7 @@ ROOTDIR="${ROOTDIR%/}" # standardize to remove trailing slash chown -R $GMUSER:$GMUSER ${GMDIR} # Configure coprocessor auto-registration -DISTRIBUTED_JAR_NAME=geomesa-hbase-distributed-runtime-hbase1_2.11-%%project.version%%.jar +DISTRIBUTED_JAR_NAME=geomesa-hbase-distributed-runtime-hbase2_%%scala.binary.version%%-%%project.version%%.jar NL=$'\n' echo The HBase Root dir is ${ROOTDIR}.