Author: enis
Date: Tue Jul 9 23:09:42 2013
New Revision: 1501602
URL: http://svn.apache.org/r1501602
Log:
HBASE-8200 Integration Test classes are not part of the default HBase classpath.
Modified:
hbase/trunk/bin/hbase
hbase/trunk/bin/hbase.cmd
hbase/trunk/hbase-assembly/pom.xml
hbase/trunk/hbase-it/pom.xml
hbase/trunk/pom.xml
Modified: hbase/trunk/bin/hbase
URL:
http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1501602&r1=1501601&r2=1501602&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Tue Jul 9 23:09:42 2013
@@ -141,13 +141,10 @@ if [ -d "$HBASE_HOME/hbase-server/target
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}"`
Modified: hbase/trunk/bin/hbase.cmd
URL:
http://svn.apache.org/viewvc/hbase/trunk/bin/hbase.cmd?rev=1501602&r1=1501601&r2=1501602&view=diff
==============================================================================
--- hbase/trunk/bin/hbase.cmd (original)
+++ hbase/trunk/bin/hbase.cmd Tue Jul 9 23:09:42 2013
@@ -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
)
Modified: hbase/trunk/hbase-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/hbase-assembly/pom.xml?rev=1501602&r1=1501601&r2=1501602&view=diff
==============================================================================
Binary files - no diff available.
Modified: hbase/trunk/hbase-it/pom.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/pom.xml?rev=1501602&r1=1501601&r2=1501602&view=diff
==============================================================================
--- hbase/trunk/hbase-it/pom.xml (original)
+++ hbase/trunk/hbase-it/pom.xml Tue Jul 9 23:09:42 2013
@@ -117,22 +117,6 @@
</pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <!-- generates the file that will be used by the bin/hbase script
in the dev env -->
- <id>create-hbase-generated-classpath</id>
- <phase>test</phase>
- <goals>
- <goal>build-classpath</goal>
- </goals>
- <configuration>
-
<outputFile>${project.build.directory}/../../target/cached_classpath.txt</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- Run integration tests with mvn verify -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: hbase/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1501602&r1=1501601&r2=1501602&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Tue Jul 9 23:09:42 2013
@@ -683,12 +683,14 @@
<exclude>**/control</exclude>
<exclude>**/conffile</exclude>
<exclude>docs/*</exclude>
+ <exclude>logs/*</exclude>
<!-- auto-gen docs -->
<!--It don't like freebsd license-->
<exclude>**/src/main/site/resources/css/freebsd_docbook.css</exclude>
<!-- exclude source control files -->
<exclude>.git/**</exclude>
<exclude>.svn/**</exclude>
+ <exclude>**/.settings/**</exclude>
</excludes>
</configuration>
</plugin>
