diff --git bin/hbase bin/hbase index 0751c2b..e738970 100755 --- bin/hbase +++ bin/hbase @@ -141,13 +141,10 @@ if [ -d "$HBASE_HOME/hbase-server/target/hbase-webapps" ]; then fi add_maven_deps_to_classpath() { - # Need to generate classpath from maven pom. This is costly so generate it - # and cache it. Save the file into our target dir so a mvn clean will get - # clean it up and force us create a new one. f="${HBASE_HOME}/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 compile)" + echo "As this is a development environment, we need ${f} to be generated from maven (command: mvn install -DskipTests)" exit 1 fi CLASSPATH=${CLASSPATH}:`cat "${f}"` diff --git bin/hbase.cmd bin/hbase.cmd index 9e2de13..a9a2169 100644 --- bin/hbase.cmd +++ bin/hbase.cmd @@ -98,12 +98,9 @@ if "%in_dev_env%"=="true" ( for /f %%i in ('dir /b %HBASE_HOME%\hbase-*') do ( if exist %%i\target\test-classes set CLASSPATH=!CLASSPATH!;%%i\target\test-classes ) - rem Need to generate classpath from maven pom. This is costly so generate it - rem and cache it. Save the file into our target dir so a mvn clean will get - rem clean it up and force us create a new one. if NOT exist "%cached_classpath_filename%" ( - echo "As this is a development environment, we need %cached_classpath_filename% to be generated from maven (command: mvn compile)" + echo "As this is a development environment, we need %cached_classpath_filename% to be generated from maven (command: mvn install -DskipTests)" goto :eof ) diff --git hbase-assembly/pom.xml hbase-assembly/pom.xml index 727eb97..cd90247 100644 --- hbase-assembly/pom.xml +++ hbase-assembly/pom.xml @@ -58,6 +58,68 @@ true + + maven-dependency-plugin + + + + create-hbase-generated-classpath + test + + build-classpath + + + ${project.build.directory}/../../target/cached_classpath.txt + + + + + + + + org.apache.hbase + hbase-it + test-jar + + + org.apache.hbase + hbase-common + test-jar + + + org.apache.hbase + hbase-server + + + org.apache.hbase + hbase-server + test-jar + test + + + org.apache.hbase + hbase-hadoop-compat + + + org.apache.hbase + hbase-hadoop-compat + ${project.version} + test-jar + test + + + org.apache.hbase + ${compat.module} + ${project.version} + + + org.apache.hbase + ${compat.module} + ${project.version} + test-jar + test + + diff --git hbase-it/pom.xml hbase-it/pom.xml index 3ff66e3..0468e03 100644 --- hbase-it/pom.xml +++ hbase-it/pom.xml @@ -117,22 +117,6 @@ - - maven-dependency-plugin - - - - create-hbase-generated-classpath - test - - build-classpath - - - ${project.build.directory}/../../target/cached_classpath.txt - - - - org.apache.maven.plugins diff --git pom.xml pom.xml index e27cc1b..437ee45 100644 --- pom.xml +++ pom.xml @@ -674,12 +674,14 @@ **/control **/conffile docs/* + logs/* **/src/main/site/resources/css/freebsd_docbook.css .git/** .svn/** + **/.settings/**