[fluo-uno] branch master updated: When using ACCUMULO_REPO, build with the appropriate Hadoop profile. (#197)

[mw...@apache.org]

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

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-uno.git


The following commit(s) were added to refs/heads/master by this push:
     new 5dea8ed  When using ACCUMULO_REPO, build with the appropriate Hadoop profile. (#197)
5dea8ed is described below

commit 5dea8ed866ca879a9ea976fb1294986818ca341c
Author: Sean Busbey <se...@gmail.com>
AuthorDate: Thu Sep 20 12:53:30 2018 -0500

    When using ACCUMULO_REPO, build with the appropriate Hadoop profile. (#197)
    
    * when HADOOP_VERSION is 3.y.z, build Accumulo with hadoop.profile=3
    * otherwise don't specify a hadoop.profile
---
 bin/impl/fetch.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/impl/fetch.sh b/bin/impl/fetch.sh
index acaf193..d5ba55a 100755
--- a/bin/impl/fetch.sh
+++ b/bin/impl/fetch.sh
@@ -59,10 +59,14 @@ function fetch_accumulo() {
   fi
 
   if [[ -n "$ACCUMULO_REPO" ]]; then
+    declare -a maven_args=(-DskipTests -DskipFormat)
+    if [[ "${HADOOP_VERSION}" = 3.* ]]; then
+      maven_args=("${maven_args[@]}" '-Dhadoop.profile=3')
+    fi
     rm -f "$DOWNLOADS/$ACCUMULO_TARBALL"
     pushd .
     cd "$ACCUMULO_REPO"
-    mvn clean package -DskipTests -DskipFormat
+    mvn clean package "${maven_args[@]}"
     accumulo_built_tarball=$ACCUMULO_REPO/assemble/target/$ACCUMULO_TARBALL
     if [[ ! -f "$accumulo_built_tarball" ]]; then
       echo