hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-18705 bin/hbase does not find cached_classpath.txt
Date Mon, 28 Aug 2017 11:09:20 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 4e7f67717 -> a7270cc08


HBASE-18705 bin/hbase does not find cached_classpath.txt

Signed-off-by: tedyu <yuzhihong@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a7270cc0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a7270cc0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a7270cc0

Branch: refs/heads/master
Commit: a7270cc08c75134d01f1f9faf079d6a17955753a
Parents: 4e7f677
Author: Balazs Meszaros <balazs.meszaros@cloudera.com>
Authored: Mon Aug 28 11:31:19 2017 +0200
Committer: tedyu <yuzhihong@gmail.com>
Committed: Mon Aug 28 04:09:05 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/a7270cc0/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 7eeaf2d..91cf015 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -164,7 +164,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)"
@@ -321,7 +321,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/a7270cc0/bin/hbase.cmd
----------------------------------------------------------------------
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index 457e4f7..0ff6ff5 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


Mime
View raw message