HBASE-20108 Remove jline exclusion from ZooKeeper

bin/hbase

@@ -363,6 +363,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" = "backup" ] ; then
   CLASS='org.apache.hadoop.hbase.backup.BackupDriver'
 elif [ "$COMMAND" = "restore" ] ; then

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

hbase-assembly/pom.xml

@@ -300,6 +300,10 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-zookeeper</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>

hbase-assembly/src/main/assembly/hadoop-two-compat.xml

@@ -72,6 +72,7 @@
               <exclude>org.jruby:jruby-complete</exclude>
               <exclude>com.sun.jersey:*</exclude>
               <exclude>com.sun.jersey.contribs:*</exclude>
+              <exclude>jline:jline</exclude>
             </excludes>
           </dependencySet>
         </dependencySets>
@@ -109,6 +110,12 @@
         <include>org.jruby:jruby-complete</include>
       </includes>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>lib/zkcli</outputDirectory>
+      <includes>
+        <include>jline:jline</include>
+      </includes>
+    </dependencySet>
   </dependencySets>
 
 </assembly>

pom.xml

@@ -1442,6 +1442,8 @@
     <thrift.path>thrift</thrift.path>
     <thrift.version>0.9.3</thrift.version>
     <zookeeper.version>3.4.10</zookeeper.version>
+    <!-- What ZooKeeper 3.4.x depends on and nothing more -->
+    <jline.version>0.9.94</jline.version>
     <slf4j.version>1.7.25</slf4j.version>
     <clover.version>4.0.3</clover.version>
     <jamon-runtime.version>2.4.1</jamon-runtime.version>
@@ -1910,6 +1912,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>jline</groupId>
+        <artifactId>jline</artifactId>
+        <version>${jline.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>