You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/03/07 10:14:46 UTC
[10/33] hbase git commit: HBASE-20108 Remove jline exclusion from
ZooKeeper
HBASE-20108 Remove jline exclusion from ZooKeeper
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2402f1fd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2402f1fd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2402f1fd
Branch: refs/heads/HBASE-19064
Commit: 2402f1fd43fbe04ecce8bac67d31931251bcac6c
Parents: b7b8683
Author: Josh Elser <el...@apache.org>
Authored: Wed Feb 28 17:11:02 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 5 15:33:51 2018 -0500
----------------------------------------------------------------------
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(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2402f1fd/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 85cc874..53c47ee 100755
--- a/bin/hbase
+++ b/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
http://git-wip-us.apache.org/repos/asf/hbase/blob/2402f1fd/bin/hbase.cmd
----------------------------------------------------------------------
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index 8e4a59f..fbeb1f8 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
http://git-wip-us.apache.org/repos/asf/hbase/blob/2402f1fd/hbase-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 8d1cc77..bcefa0a 100644
--- a/hbase-assembly/pom.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/2402f1fd/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index 2aa3e57..69a800b 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/2402f1fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 99415cd..b8b0225 100755
--- a/pom.xml
+++ b/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>
@@ -1911,6 +1913,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>