svn commit: r1414868 - /hbase/trunk/bin/hbase

[ec...@apache.org]

Author: eclark
Date: Wed Nov 28 19:05:15 2012
New Revision: 1414868

URL: http://svn.apache.org/viewvc?rev=1414868&view=rev
Log:
HBASE-7168 ADD in the script called 'hbase', we don't check for errors when generating the classpath with mvn

Modified:
    hbase/trunk/bin/hbase

Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1414868&r1=1414867&r2=1414868&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Wed Nov 28 19:05:15 2012
@@ -156,13 +156,16 @@ add_maven_deps_to_classpath() {
   f="${HBASE_HOME}/target/cached_classpath.txt"
   if [ ! -f "${f}" ]
   then
-    ${MVN} -f "${HBASE_HOME}/pom.xml" package dependency:build-classpath -DskipTests -Dmdep.outputFile="${f}" $MAVEN_OPTS &> /dev/null
+    #we need hbase-it to always be the last module run. since it has the largest classpath
+    modules=`find hbase-* -type f -name 'pom.xml' |sed 's#\(.*\)/.*#\1#' | sed '/hbase-it/d' |sort -u  | paste -s -d , -`
+    modules="${modules},hbase-it"
+    ${MVN} -f "${HBASE_HOME}/pom.xml" package dependency:build-classpath -DskipTests -Dmdep.outputFile="${f}" -pl "${modules}" &> /dev/null
     if [ $? -ne 0 ]
     then
       #delete the file, maven writes it even on failure. Keeping it would breaks the caching mechanism the next time we call the script
       rm -rf "${f}"
       echo "The maven command used to generate the classpath failed, please check your environment."
-      echo "Maven command was: ${MVN} -f '${HBASE_HOME}/pom.xml' package dependency:build-classpath -DskipTests -Dmdep.outputFile='${f}' $MAVEN_OPTS"
+      echo "Maven command was: ${MVN} -f '${HBASE_HOME}/pom.xml' package dependency:build-classpath -DskipTests -Dmdep.outputFile='${f}' -pl '${modules}'"
       exit 1
     fi
   fi