From 4c96a8d8e9afda7331210a91eee2b78ff10c050c Mon Sep 17 00:00:00 2001
From: Norbert Hu <norberthu@foursquare.com>
Date: Tue, 13 Dec 2011 13:56:58 -0800
Subject: [PATCH] Fix incorrect integration test pom specification

---
 pom.xml | 74 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 758a2b9..9d0311c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,24 +3,51 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>com.foursquare</groupId>
   <artifactId>heapaudit</artifactId>
   <version>1.0.2</version>
+  <packaging>jar</packaging>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-all</artifactId>
+      <version>3.3.1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
   <build>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
         <configuration>
           <archive>
             <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.2.2</version>
+        <version>1.5</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -37,29 +64,40 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.11</version>
         <configuration>
-          <argLine>-javaagent:${basedir}/target/${artifactId}-${version}.jar="-Corg/apache/maven/.+ -Cjunit/.+ -Corg/junit/.+"</argLine>
-          <workingDirectory>${basedir}/target</workingDirectory>
+          <excludes>
+            <exclude>**/Test*.java</exclude>
+          </excludes>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.11</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+            <configuration>
+              <argLine>-javaagent:${project.build.directory}/${artifactId}-${version}.jar="-Corg/apache/maven/.+ -Cjunit/.+ -Corg/junit/.+"</argLine>
+              <workingDirectory>${project.build.directory}</workingDirectory>
+              <includes>
+                <include>**/Test*.java</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-all</artifactId>
-      <version>3.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
-      <type>jar</type>
-      <scope>test</scope>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
+
 </project>