[accumulo] branch 1.9 updated: Make Accumulo 1.9 compatible with ZK 3.5 (#1506)

[ctubbsii]

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

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
     new b75f449  Make Accumulo 1.9 compatible with ZK 3.5 (#1506)
b75f449 is described below

commit b75f449f0eea897e1e3eae8cdbb6cc519f2d0344
Author: Karthick Narendran <karthick.narend...@gmail.com>
AuthorDate: Wed Feb 12 12:43:39 2020 -0500

    Make Accumulo 1.9 compatible with ZK 3.5 (#1506)
---
 assemble/bin/start-all.sh                 | 2 +-
 assemble/conf/templates/accumulo-site.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assemble/bin/start-all.sh b/assemble/bin/start-all.sh
index f03a6a8..984a85d 100755
--- a/assemble/bin/start-all.sh
+++ b/assemble/bin/start-all.sh
@@ -45,7 +45,7 @@ if [ ! -d $ZOOKEEPER_HOME ]; then
    exit 1
 fi
 
-ZOOKEEPER_VERSION=$(find -L $ZOOKEEPER_HOME -maxdepth 1 -name 
"zookeeper-[0-9]*.jar" | head -1)
+ZOOKEEPER_VERSION=$(find -L $ZOOKEEPER_HOME -maxdepth 2 -name 
"zookeeper-[0-9]*.jar" | head -1)
 if [ -z "$ZOOKEEPER_VERSION" ]; then
    echo "A Zookeeper JAR was not found in $ZOOKEEPER_HOME."
    echo "Please check ZOOKEEPER_HOME, either globally or in accumulo-env.sh."
diff --git a/assemble/conf/templates/accumulo-site.xml 
b/assemble/conf/templates/accumulo-site.xml
index 5f80623..1871397 100644
--- a/assemble/conf/templates/accumulo-site.xml
+++ b/assemble/conf/templates/accumulo-site.xml
@@ -139,6 +139,7 @@ ${mvnProjBaseDir}
       $ACCUMULO_HOME/lib/[^.].*.jar,
       <!-- ZooKeeper requirements -->
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+      $ZOOKEEPER_HOME/lib/zookeeper[^.].*.jar,
       <!-- Common Hadoop requirements -->
       $HADOOP_CONF_DIR,
       <!-- Hadoop 2 requirements -->