WHIRR-646. Integration tests should have failsafe timeouts. Contributed by abayer.
diff --git a/CHANGES.txt b/CHANGES.txt
index e836495..c3a0183 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,9 @@
     WHIRR-648. CDH repo install removes other repos with same prefix.
     (Graham Gear via tomwhite)
 
+    WHIRR-646. Integration tests should have failsafe timeouts.
+    (abayer via tomwhite)
+
 Release 0.8.0 - 2012-08-17
 
   NEW FEATURES
diff --git a/pom.xml b/pom.xml
index 8b47c00..e0ceabb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,7 +394,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.11</version>
+        <version>2.12</version>
         <configuration>
           <excludes>
             <exclude>**/integration/*Test.java</exclude>
@@ -621,8 +621,9 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.11</version>
+            <version>2.12</version>
             <configuration>
+              <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
               <includes>
                 <include>**/integration/*Test.java</include>
               </includes>