From 921001000f67cf151dcbe08e20f7ad14d7d218f8 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 2 Jan 2015 15:35:47 +0100
Subject: [PATCH 01/20] Require maven 2.2.1 (based on current plugin usage)

Former-commit-id: e8d8d98e84982792405af30b6dec11d201ac6895
---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5493a81f4..67a61f9f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,9 @@ Copyright (c) 2012 - Jeremy Long
         </site>
     </distributionManagement>
     <!-- end copy -->
+    <prerequisites>
+        <maven>2.2.1</maven>
+    </prerequisites>
     <build>
         <plugins>
             <plugin>

From 112b158795fc51dd719d7e7bd2b606f0a34b552a Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 2 Jan 2015 15:51:41 +0100
Subject: [PATCH 02/20] Move maven-compiler-plugin (along with common
 configuration) in under pluginManagement so we have the information in a
 single place

Former-commit-id: e729555a7edb1e41759bf8f1851cbfc81bd8917a
---
 dependency-check-ant/pom.xml   |  6 ------
 dependency-check-cli/pom.xml   |  6 ------
 dependency-check-core/pom.xml  |  4 ----
 dependency-check-maven/pom.xml |  6 ------
 dependency-check-utils/pom.xml |  6 ------
 pom.xml                        | 19 ++++++++++++++-----
 6 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index 09b519e62..f188305d1 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -282,12 +282,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <showDeprecation>false</showDeprecation>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
             </plugin>
 
             <plugin>
diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml
index e3d0f98fe..a6e326005 100644
--- a/dependency-check-cli/pom.xml
+++ b/dependency-check-cli/pom.xml
@@ -133,12 +133,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <showDeprecation>false</showDeprecation>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index 3e29a7eba..fc21c4c8e 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -397,12 +397,8 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
                 <configuration>
-                    <showDeprecation>false</showDeprecation>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
-                    <source>1.6</source>
-                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml
index 738986ed4..3a227b4df 100644
--- a/dependency-check-maven/pom.xml
+++ b/dependency-check-maven/pom.xml
@@ -280,12 +280,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <showDeprecation>false</showDeprecation>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml
index 01a0ddac9..ffe519f36 100644
--- a/dependency-check-utils/pom.xml
+++ b/dependency-check-utils/pom.xml
@@ -118,12 +118,6 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <showDeprecation>false</showDeprecation>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 67a61f9f2..5cb1affc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,20 @@ Copyright (c) 2012 - Jeremy Long
         <maven>2.2.1</maven>
     </prerequisites>
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.1</version>
+                    <configuration>
+                        <showDeprecation>false</showDeprecation>
+                        <source>1.6</source>
+                        <target>1.6</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -138,11 +152,6 @@ Copyright (c) 2012 - Jeremy Long
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 2931e8454ce8fb911e6d9ab3dc635069f71b5d98 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 2 Jan 2015 15:53:52 +0100
Subject: [PATCH 03/20] Upgrade maven-compiler-plugin to version 3.2

Former-commit-id: 870aad70a81c782bd209f9c49288460234f69fca
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5cb1affc9..435b7fc6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@ Copyright (c) 2012 - Jeremy Long
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
+                    <version>3.2</version>
                     <configuration>
                         <showDeprecation>false</showDeprecation>
                         <source>1.6</source>

From ccd656845d783bca877b5321ec67530628cb3e7b Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 2 Jan 2015 16:44:19 +0100
Subject: [PATCH 04/20] Use a common version number for resources-plugin

Former-commit-id: 253864d637907491e2e21500540c3c2f6e03627c
---
 dependency-check-ant/pom.xml | 1 -
 pom.xml                      | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index f188305d1..02d4050b4 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -68,7 +68,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <escapeWindowsPaths>false</escapeWindowsPaths>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index 435b7fc6a..8d3e1dba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,11 @@ Copyright (c) 2012 - Jeremy Long
                         <target>1.6</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.7</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -156,7 +161,6 @@ Copyright (c) 2012 - Jeremy Long
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
                 <executions>
                     <execution>
                         <id>site-filtering-hack</id>

From b3867244ba93e657f8031a7bc2e7217f9fcb8b27 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 2 Jan 2015 21:46:13 +0100
Subject: [PATCH 05/20] Unify maven-surefire-plugin version and upgrade it to
 2.18.1

Former-commit-id: 0c5f41e379f4b20f32efb8435ab9efe9fd77d7d8
---
 dependency-check-ant/pom.xml   | 1 -
 dependency-check-cli/pom.xml   | 1 -
 dependency-check-core/pom.xml  | 1 -
 dependency-check-maven/pom.xml | 1 -
 dependency-check-utils/pom.xml | 1 -
 pom.xml                        | 5 +++++
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index 02d4050b4..d2190d973 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -268,7 +268,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <systemProperties>
                         <property>
diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml
index a6e326005..a52785f11 100644
--- a/dependency-check-cli/pom.xml
+++ b/dependency-check-cli/pom.xml
@@ -114,7 +114,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <systemProperties>
                         <property>
diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index fc21c4c8e..b4f0661ea 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -192,7 +192,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <systemProperties>
                         <property>
diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml
index 3a227b4df..5a8abe07d 100644
--- a/dependency-check-maven/pom.xml
+++ b/dependency-check-maven/pom.xml
@@ -89,7 +89,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <systemProperties>
                         <property>
diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml
index ffe519f36..824efb883 100644
--- a/dependency-check-utils/pom.xml
+++ b/dependency-check-utils/pom.xml
@@ -78,7 +78,6 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
                 <configuration>
                     <systemProperties>
                         <property>
diff --git a/pom.xml b/pom.xml
index 8d3e1dba9..e53820a91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,11 @@ Copyright (c) 2012 - Jeremy Long
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>2.7</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.18.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

From bb2b25cca5968e823069c7037651bae9fd1e79d5 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 2 Jan 2015 22:15:49 +0100
Subject: [PATCH 06/20] Unify maven-jar-plugin version and upgrade it to 2.5

Former-commit-id: b0da5b80252e9b07ccb7d955487f595caef4d4bc
---
 dependency-check-ant/pom.xml  | 11 -----------
 dependency-check-cli/pom.xml  |  5 -----
 dependency-check-core/pom.xml | 11 -----------
 pom.xml                       | 15 +++++++++++++++
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index d2190d973..d41a7b5c0 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -220,17 +220,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                    <excludes>
-                        <exclude>**/checkstyle*</exclude>
-                    </excludes>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml
index a52785f11..2376be5c9 100644
--- a/dependency-check-cli/pom.xml
+++ b/dependency-check-cli/pom.xml
@@ -60,17 +60,12 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
                 <configuration>
                     <archive>
                         <manifest>
                             <mainClass>org.owasp.dependencycheck.App</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                     </archive>
-                    <excludes>
-                        <exclude>**/checkstyle*</exclude>
-                    </excludes>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index b4f0661ea..a92e61321 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -110,7 +110,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>jar</id>
@@ -127,16 +126,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                    <excludes>
-                        <exclude>**/checkstyle*</exclude>
-                    </excludes>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/pom.xml b/pom.xml
index e53820a91..e40b2ac7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,21 @@ Copyright (c) 2012 - Jeremy Long
                         <target>1.6</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                        </archive>
+                        <excludes>
+                            <exclude>**/checkstyle*</exclude>
+                        </excludes>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>

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 07/20] 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>

From a892c5e7b7f00e254039395e581573321d53267c Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 11:53:40 +0100
Subject: [PATCH 08/20] Turns out surefire-plugin was used a different place
 too, which is why the old version number still turned up.

Former-commit-id: afab74d409527aae0e60094f18e48ed9e044ac37
---
 dependency-check-core/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index 6abad2c74..4d95e1c00 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -573,7 +573,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.16</version>
                         <configuration>
                             <skip>true</skip>
                         </configuration>

From 0671d126288681d5ce64707b10b9fd4085d45f16 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 13:31:42 +0100
Subject: [PATCH 09/20] On second thought, try to upgrade the version numbers
 for this profile manually.

Former-commit-id: 6ee31dfb9407fa9d04c1a2dd8e1eae2b2047109f
---
 dependency-check-core/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index 4d95e1c00..903e7f0ad 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -573,6 +573,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.18.1</version>
                         <configuration>
                             <skip>true</skip>
                         </configuration>
@@ -580,7 +581,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.16</version>
+                        <version>2.18.1</version>
                         <configuration>
                             <systemProperties>
                                 <property>

From c81b8b0171490369d18adcf3368d2a51938e35f2 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 13:45:17 +0100
Subject: [PATCH 10/20] Excplicitly state version numbers for some plugins used

Former-commit-id: b33cbe06b416423593c8b405747295cc86e998a7
---
 pom.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae2eefd04..e2ead0c6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,11 @@ Copyright (c) 2012 - Jeremy Long
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>2.6.1</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -141,6 +146,11 @@ Copyright (c) 2012 - Jeremy Long
                         <target>1.6</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
@@ -165,6 +175,11 @@ Copyright (c) 2012 - Jeremy Long
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.5.2</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -180,6 +195,11 @@ Copyright (c) 2012 - Jeremy Long
                         </excludes>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.4.2</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -196,7 +216,6 @@ Copyright (c) 2012 - Jeremy Long
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.4.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 65992243fac142476942f9312331216dc64aa621 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 13:48:12 +0100
Subject: [PATCH 11/20] Upgrade dependency-plugin to 2.9

Former-commit-id: 028218cd6c24e75216a41e14e79bd23a2073515a
---
 dependency-check-core/pom.xml | 1 -
 pom.xml                       | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index 903e7f0ad..b499b5740 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -93,7 +93,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.8</version>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
diff --git a/pom.xml b/pom.xml
index e2ead0c6a..f93601abd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,11 @@ Copyright (c) 2012 - Jeremy Long
                         <target>1.6</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.9</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>

From d59cce8080231018e93a4b312b8cc9361796c08b Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 16:09:06 +0100
Subject: [PATCH 12/20] Move non-version configuration out of pluginManagement

Former-commit-id: c3983849102331d42aa5dd562ccc319b1c5e9104
---
 pom.xml | 76 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index f93601abd..5940c6b96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,11 +140,6 @@ Copyright (c) 2012 - Jeremy Long
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.2</version>
-                    <configuration>
-                        <showDeprecation>false</showDeprecation>
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -160,25 +155,6 @@ Copyright (c) 2012 - Jeremy Long
                     <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>
@@ -189,16 +165,6 @@ Copyright (c) 2012 - Jeremy Long
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>2.5</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            </manifest>
-                        </archive>
-                        <excludes>
-                            <exclude>**/checkstyle*</exclude>
-                        </excludes>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -225,6 +191,48 @@ Copyright (c) 2012 - Jeremy Long
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <showDeprecation>false</showDeprecation>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <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>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                    <excludes>
+                        <exclude>**/checkstyle*</exclude>
+                    </excludes>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From a9eab16502ce5c33c7650adea17b7d99728e09ad Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 16:30:28 +0100
Subject: [PATCH 13/20] Add and upgrade assembly-plugin

Former-commit-id: e8c20c61a1bd78065f7ae4eed6751015a3d414c8
---
 dependency-check-cli/pom.xml |  1 -
 pom.xml                      | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml
index 2376be5c9..60847fa58 100644
--- a/dependency-check-cli/pom.xml
+++ b/dependency-check-cli/pom.xml
@@ -274,7 +274,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>appassembler-maven-plugin</artifactId>
-                <version>1.8.1</version>
                 <configuration>
                     <programs>
                         <program>
diff --git a/pom.xml b/pom.xml
index 5940c6b96..ef0683a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,16 @@ Copyright (c) 2012 - Jeremy Long
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>appassembler-maven-plugin</artifactId>
+                    <version>1.9</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.5.3</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>

From d2e7de5505c5a6b80a0b40e70efa0fdff7f038ae Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 16:34:08 +0100
Subject: [PATCH 14/20] Unify cobertura-maven-plugin version number

Former-commit-id: f3c995b91cf8b480f4c03ccec8d9371dba75eb35
---
 dependency-check-ant/pom.xml   | 1 -
 dependency-check-cli/pom.xml   | 1 -
 dependency-check-core/pom.xml  | 1 -
 dependency-check-utils/pom.xml | 1 -
 pom.xml                        | 5 +++++
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index d41a7b5c0..e713b93da 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -224,7 +224,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <instrumentation>
                         <ignoreTrivial>true</ignoreTrivial>
diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml
index 60847fa58..10a2e445d 100644
--- a/dependency-check-cli/pom.xml
+++ b/dependency-check-cli/pom.xml
@@ -71,7 +71,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <instrumentation>
                         <ignoreTrivial>true</ignoreTrivial>
diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index b499b5740..72fc851b6 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -129,7 +129,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <instrumentation>
                         <ignoreTrivial>true</ignoreTrivial>
diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml
index ebea07364..291b9265f 100644
--- a/dependency-check-utils/pom.xml
+++ b/dependency-check-utils/pom.xml
@@ -45,7 +45,6 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <instrumentation>
                         <ignoreTrivial>true</ignoreTrivial>
diff --git a/pom.xml b/pom.xml
index ef0683a40..a7c3248be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,11 @@ Copyright (c) 2012 - Jeremy Long
                     <artifactId>appassembler-maven-plugin</artifactId>
                     <version>1.9</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>cobertura-maven-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>

From 7a246b90b9897606935acc98ba897ad6f1c3a67d Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 16:42:13 +0100
Subject: [PATCH 15/20] Upgrade maven-shade-plugin to 2.3. This requires
 building with maven 3.0 or later for that module

Former-commit-id: 9792754be3cb1c931a1736c41a258fa31556912a
---
 dependency-check-ant/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index e713b93da..14f2c38d6 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -37,6 +37,9 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
         </site>
     </distributionManagement>
     <!-- end copy -->
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
     <build>
         <resources>
             <resource>
@@ -193,7 +196,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.3</version>
                 <configuration>
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />

From 429f0966f0db5ad7f89331817f39a9881f05876a Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 17:22:42 +0100
Subject: [PATCH 16/20] Move maven-enforcer-plugin and -plugin-plugin to
 pluginManagement. Upgraded them to the latest version

Former-commit-id: a8226623cddfbc034b6293f48946e2109c426dde
---
 dependency-check-maven/pom.xml |  2 --
 pom.xml                        | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml
index 5a8abe07d..96e0a862f 100644
--- a/dependency-check-maven/pom.xml
+++ b/dependency-check-maven/pom.xml
@@ -66,7 +66,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.2</version>
                 <configuration>
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                     <goalPrefix>dependency-check</goalPrefix>
@@ -106,7 +105,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
                 <inherited>true</inherited>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.2</version>
                 <executions>
                     <execution>
                         <id>enforce-maven-3</id>
diff --git a/pom.xml b/pom.xml
index a7c3248be..075ee927c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,11 @@ Copyright (c) 2012 - Jeremy Long
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.9</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.3.1</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -181,6 +186,11 @@ Copyright (c) 2012 - Jeremy Long
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>2.5</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.3</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>

From 55c4d729bb5400fdae7696b408cdaa268e796ba1 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 3 Jan 2015 17:28:59 +0100
Subject: [PATCH 17/20] Upgrade maven-release-plugin to version 2.5.1

Former-commit-id: 969df121db73b824e40137c9b6420bc85ec03e4d
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 075ee927c..16faa4842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,7 @@ Copyright (c) 2012 - Jeremy Long
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.4.2</version>
+                    <version>2.5.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From 300d9902761e675664fd5417897fedf517c6f809 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Mon, 5 Jan 2015 19:36:25 +0100
Subject: [PATCH 18/20] Set required maven version to the strictest option for
 all modules

Former-commit-id: 998498cd118460f42e35c10dfc42162e8f717de9
---
 dependency-check-ant/pom.xml   | 3 ---
 dependency-check-maven/pom.xml | 3 ---
 pom.xml                        | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml
index 14f2c38d6..fc1dc8271 100644
--- a/dependency-check-ant/pom.xml
+++ b/dependency-check-ant/pom.xml
@@ -37,9 +37,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
         </site>
     </distributionManagement>
     <!-- end copy -->
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
     <build>
         <resources>
             <resource>
diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml
index 96e0a862f..43ee386ae 100644
--- a/dependency-check-maven/pom.xml
+++ b/dependency-check-maven/pom.xml
@@ -40,9 +40,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         </site>
     </distributionManagement>
     <!-- end copy -->
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
     <build>
         <resources>
             <resource>
diff --git a/pom.xml b/pom.xml
index 16faa4842..629e1654e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@ Copyright (c) 2012 - Jeremy Long
     </distributionManagement>
     <!-- end copy -->
     <prerequisites>
-        <maven>2.2.1</maven>
+        <maven>3.0</maven>
     </prerequisites>
     <build>
         <pluginManagement>

From db6c471cc66efe707faa26afd8d49d3daadbd237 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Mon, 5 Jan 2015 19:49:37 +0100
Subject: [PATCH 19/20] Add gpg-plugin to pluginManagement and upgrade it to
 1.5

Former-commit-id: 28c94304a02bd3148a07ce37ef96a9259d61d7f9
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 629e1654e..098cfe822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,11 @@ Copyright (c) 2012 - Jeremy Long
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>2.18.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.5</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>

From 85ad0b881f8ba661642fa0e5df2fd34c490fb137 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Mon, 5 Jan 2015 20:04:14 +0100
Subject: [PATCH 20/20] Also removed old version number from gpg-plugin

Former-commit-id: 278ebc103fb3fb54e6f01f14cacfb2d93bbd074a
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 098cfe822..bbaae40a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,7 +361,6 @@ Copyright (c) 2012 - Jeremy Long
             <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.4</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>