From 0e22f9ec78539b87b35802b5e033d032972c132e Mon Sep 17 00:00:00 2001
From: Enis Soztutar <enis@apache.org>
Date: Tue, 9 Jul 2013 23:09:42 +0000
Subject: [PATCH] HBASE-8200 Integration Test classes are not part of the
 default HBase classpath.

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1501602 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/hbase              |  5 +---
 bin/hbase.cmd          |  5 +---
 hbase-assembly/pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++
 hbase-it/pom.xml       | 16 -----------
 pom.xml                |  2 ++
 5 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/bin/hbase b/bin/hbase
index 0751c2b0366..e7389708d39 100755
--- a/bin/hbase
+++ b/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 a/bin/hbase.cmd b/bin/hbase.cmd
index 9e2de133af7..a9a2169250e 100644
--- a/bin/hbase.cmd
+++ b/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 a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 727eb973258..cd902478b71 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -58,6 +58,68 @@
             <skip>true</skip>
           </configuration>
         </plugin>
+      <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>
     </plugins>
   </build>
+  <dependencies>
+	<!-- Intra-project dependencies -->
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-it</artifactId>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-common</artifactId>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-hadoop-compat</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-hadoop-compat</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>${compat.module}</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>${compat.module}</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 21750dc5522..eb3d068255c 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 0f41cd2139c..116abe1a5e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>