merging in fork changes

neo4j · Jun 29, 2017 · e7abbb0 · e7abbb0
1 parent 41c14f3
commit e7abbb0
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/enterprise/causal-clustering/pom.xml b/enterprise/causal-clustering/pom.xml
@@ -48,17 +48,6 @@
         </license>
     </licenses>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <forkCount>1</forkCount>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.neo4j</groupId>
@@ -252,13 +241,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.19.1</version>
                 <configuration>
                     <forkCount>2C</forkCount>
                     <parallel>classes</parallel>
                     <!-- Misha says it is not safe to run tests with more than one thread per JVM -->
                     <!-- He also said he'd fix that! -->
                     <threadCount>1</threadCount>
+                    <reuseForks>true</reuseForks>
+                    <runOrder>random</runOrder>
                     <!-- slowest test class takes up to 10 minutes, so let's cater for that, with contingency -->
                     <parallelTestsTimeoutInSeconds>1200</parallelTestsTimeoutInSeconds>
                     <parallelTestsTimeoutForcedInSeconds>1800</parallelTestsTimeoutForcedInSeconds>