From 9e2b366ef9826ae1d1df8f2baab650961450758d Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Wed, 28 Feb 2018 17:11:02 -0500 Subject: [PATCH] HBASE-20108 Remove jline exclusion from ZooKeeper --- bin/hbase | 3 +++ bin/hbase.cmd | 1 + hbase-assembly/pom.xml | 4 ++++ hbase-assembly/src/main/assembly/hadoop-two-compat.xml | 7 +++++++ pom.xml | 7 +++++++ 5 files changed, 22 insertions(+) diff --git a/bin/hbase b/bin/hbase index f2d4251875..70cae9cb51 100755 --- a/bin/hbase +++ b/bin/hbase @@ -361,6 +361,9 @@ elif [ "$COMMAND" = "hfile" ] ; then CLASS='org.apache.hadoop.hbase.io.hfile.HFilePrettyPrinter' elif [ "$COMMAND" = "zkcli" ] ; then CLASS="org.apache.hadoop.hbase.zookeeper.ZKMainServer" + for f in $HBASE_HOME/lib/zkcli/*.jar; do + CLASSPATH="${CLASSPATH}:$f"; + done elif [ "$COMMAND" = "upgrade" ] ; then echo "This command was used to upgrade to HBase 0.96, it was removed in HBase 2.0.0." echo "Please follow the documentation at http://hbase.apache.org/book.html#upgrading." diff --git a/bin/hbase.cmd b/bin/hbase.cmd index 8e4a59f92d..fbeb1f8290 100644 --- a/bin/hbase.cmd +++ b/bin/hbase.cmd @@ -425,6 +425,7 @@ goto :eof :zkcli set CLASS=org.apache.hadoop.hbase.zookeeper.ZKMainServer + set CLASSPATH=!CLASSPATH!;%HBASE_HOME%\lib\zkcli\* goto :eof :mapredcp diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index ddc5425f40..cfb577b473 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -278,6 +278,10 @@ org.apache.hbase hbase-zookeeper + + jline + jline + diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index 3579476e75..3c940e9f0f 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -68,6 +68,7 @@ org.jruby:jruby-complete com.sun.jersey:* com.sun.jersey.contribs:* + jline:jline @@ -105,6 +106,12 @@ org.jruby:jruby-complete + + lib/zkcli + + jline:jline + + diff --git a/pom.xml b/pom.xml index 2455253163..38a50fed12 100755 --- a/pom.xml +++ b/pom.xml @@ -1340,6 +1340,8 @@ thrift 0.9.3 3.4.10 + + 0.9.94 1.7.25 4.0.3 2.4.1 @@ -1782,6 +1784,11 @@ + + jline + jline + ${jline.version} + org.apache.thrift libthrift -- 2.16.1