Repository: hbase Updated Branches: refs/heads/branch-2 96a42b735 -> ac18ae272 refs/heads/branch-2.0 96a42b735 -> 6e55325a8
HBASE-20108 Remove jline exclusion from ZooKeeper Signed-off-by: Mike Drob <md...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6e55325a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6e55325a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6e55325a Branch: refs/heads/branch-2.0 Commit: 6e55325a802e1df2cb270c230dc6580c9e365663 Parents: 96a42b7 Author: Josh Elser <els...@apache.org> Authored: Wed Feb 28 17:11:02 2018 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Mar 7 14:36:08 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/6e55325a/bin/hbase ---------------------------------------------------------------------- diff --git a/bin/hbase b/bin/hbase index f2d4251..70cae9c 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."; http://git-wip-us.apache.org/repos/asf/hbase/blob/6e55325a/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/6e55325a/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 2ce7224..eda6491 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -271,6 +271,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/6e55325a/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 3579476..3c940e9 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 @@ <exclude>org.jruby:jruby-complete</exclude> <exclude>com.sun.jersey:*</exclude> <exclude>com.sun.jersey.contribs:*</exclude> + <exclude>jline:jline</exclude> </excludes> </dependencySet> </dependencySets> @@ -105,6 +106,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/6e55325a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e2d37f8..30649c7 100755 --- a/pom.xml +++ b/pom.xml @@ -1341,6 +1341,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> @@ -1788,6 +1790,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>
