From b5c21ffbf02feeb420630c37c4edc9cb0c3b2691 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 2 Jan 2015 22:49:08 +0100
Subject: [PATCH] Unify maven-failsafe-plugin version and upgrade it to 2.18.1

Former-commit-id: 73383c93e2bd5aecc2ad5005fe2cfaeaac700ca7
---
 dependency-check-core/pom.xml  | 17 -----------------
 dependency-check-utils/pom.xml | 20 --------------------
 pom.xml                        | 24 ++++++++++++++++++++++++
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index a92e61321..6abad2c74 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -201,31 +201,14 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <systemProperties>
                         <property>
                             <name>data.directory</name>
                             <value>${project.build.directory}/data</value>
                         </property>
-                        <property>
-                            <name>temp.directory</name>
-                            <value>${project.build.directory}/temp</value>
-                        </property>
-
                     </systemProperties>
-                    <includes>
-                        <include>**/*IntegrationTest.java</include>
-                    </includes>
                 </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml
index 824efb883..ebea07364 100644
--- a/dependency-check-utils/pom.xml
+++ b/dependency-check-utils/pom.xml
@@ -93,26 +93,6 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.16</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>temp.directory</name>
-                            <value>${project.build.directory}/temp</value>
-                        </property>
-                    </systemProperties>
-                    <includes>
-                        <include>**/*IntegrationTest.java</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index e40b2ac7c..ae2eefd04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,30 @@ Copyright (c) 2012 - Jeremy Long
                         <target>1.6</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>2.18.1</version>
+                    <configuration>
+                        <systemProperties>
+                            <property>
+                                <name>temp.directory</name>
+                                <value>${project.build.directory}/temp</value>
+                            </property>
+                        </systemProperties>
+                        <includes>
+                            <include>**/*IntegrationTest.java</include>
+                        </includes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>