commit abb66e2712bbf58c7ac72fc36490cbbf5c2f96ff
author Keith Turner <kturner@apache.org> Thu May 04 17:37:43 2017 -0400
committer Keith Turner <kturner@apache.org> Thu May 04 17:37:43 2017 -0400
tree 074175dce1a4b77520add0a0dff205ee8379e600
parent 241fc5552b453c3a7d1094f718ea892d2b2cdeca

Configure thrift runtime version based on thrift version

bin/impl/base.sh

diff --git a/bin/impl/base.sh b/bin/impl/base.sh
index 6aec7a7..af089f5 100755
--- a/bin/impl/base.sh
+++ b/bin/impl/base.sh
@@ -56,5 +56,6 @@
 
   : ${ACCUMULO_VERSION?"ACCUMULO_VERSION must be set in bash env or conf/webindex-env.sh"}
   : ${FLUO_VERSION?"FLUO_VERSION must be set in bash env or conf/webindex-env.sh"}
-  mvn clean package -Pcreate-shade-jar -DskipTests -Dfluo.version=$FLUO_VERSION -Daccumulo.version=$ACCUMULO_VERSION
+  : ${THRIFT_VERSION?"THRIFT_VERSION must be set in bash env or conf/webindex-env.sh"}
+  mvn clean package -Pcreate-shade-jar -DskipTests -Dfluo.version=$FLUO_VERSION -Daccumulo.version=$ACCUMULO_VERSION -Dthrift.version=$THRIFT_VERSION
 fi

conf/webindex-env.sh.example

diff --git a/conf/webindex-env.sh.example b/conf/webindex-env.sh.example
index e7d7d93..2121ee7 100644
--- a/conf/webindex-env.sh.example
+++ b/conf/webindex-env.sh.example
@@ -29,6 +29,15 @@
 export FLUO_VERSION=`$FLUO_HOME/bin/fluo version`
 export ACCUMULO_VERSION=`accumulo version`
 
+# Accumulo client will likely not work without correct thrift version
+if [ $ACCUMULO_VERSION '<' "1.8" ]; then
+  THRIFT_VERSION="0.9.1"
+elif [ $ACCUMULO_VERSION '<' "2.0" ]; then
+  THRIFT_VERSION="0.9.3"
+else
+  THRIFT_VERSION="10.0.0"
+fi
+
 # Spark
 # =====
 test -z "$SPARK_HOME" && export SPARK_HOME=/path/to/spark