You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/11/02 17:09:06 UTC
hbase git commit: HBASE-18705 bin/hbase does not find
cached_classpath.txt
Repository: hbase
Updated Branches:
refs/heads/branch-2 547d46cfa -> 28185c517
HBASE-18705 bin/hbase does not find cached_classpath.txt
Signed-off-by: tedyu <yu...@gmail.com>
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/28185c51
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/28185c51
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/28185c51
Branch: refs/heads/branch-2
Commit: 28185c51717feb86d9f2d63078cfc8ad81899283
Parents: 547d46c
Author: Balazs Meszaros <ba...@cloudera.com>
Authored: Mon Aug 28 11:31:19 2017 +0200
Committer: Michael Stack <st...@apache.org>
Committed: Thu Nov 2 10:08:44 2017 -0700
----------------------------------------------------------------------
bin/hbase | 4 ++--
bin/hbase.cmd | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/28185c51/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index ad2f3b8..998bdbe 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -172,7 +172,7 @@ if [ -d "$HBASE_HOME/hbase-server/target/hbase-webapps" ]; then
fi
add_maven_deps_to_classpath() {
- f="${HBASE_HOME}/target/cached_classpath.txt"
+ f="${HBASE_HOME}/hbase-build-configuration/target/cached_classpath.txt"
if [ ! -f "${f}" ]
then
echo "As this is a development environment, we need ${f} to be generated from maven (command: mvn install -DskipTests)"
@@ -329,7 +329,7 @@ if [[ $jruby_needed ]]; then
else # JRUBY_HOME is not specified explicitly
if $in_dev_env; then # in dev environment
- F_JRUBY="${HBASE_HOME}/target/cached_classpath_jruby.txt"
+ F_JRUBY="${HBASE_HOME}/hbase-build-configuration/target/cached_classpath_jruby.txt"
if [ ! -f "${F_JRUBY}" ]; then
echo "As this is a development environment, we need ${F_JRUBY} to be generated from maven (command: mvn install -DskipTests)"
exit 1
http://git-wip-us.apache.org/repos/asf/hbase/blob/28185c51/bin/hbase.cmd
----------------------------------------------------------------------
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index af546a7..070cb61 100644
--- a/bin/hbase.cmd
+++ b/bin/hbase.cmd
@@ -103,7 +103,7 @@ if defined HBASE_OFFHEAPSIZE (
set CLASSPATH=%HBASE_CONF_DIR%;%JAVA_HOME%\lib\tools.jar
rem Add maven target directory
-set cached_classpath_filename=%HBASE_HOME%\target\cached_classpath.txt
+set cached_classpath_filename=%HBASE_HOME%\hbase-build-configuration\target\cached_classpath.txt
if "%in_dev_env%"=="true" (
rem adding maven main classes to classpath
@@ -288,7 +288,7 @@ if defined jruby-needed (
if not defined JRUBY_HOME (
@rem in dev environment
if "%in_dev_env%"=="true" (
- set cached_classpath_jruby_filename=%HBASE_HOME%\target\cached_classpath_jruby.txt
+ set cached_classpath_jruby_filename=%HBASE_HOME%\hbase-build-configuration\target\cached_classpath_jruby.txt
if not exist "!cached_classpath_jruby_filename!" (
echo "As this is a development environment, we need !cached_classpath_jruby_filename! to be generated from maven (command: mvn install -DskipTests)"
goto :eof