From 8b56349daa5ccde15ab1b2cc82e05ab718c92788 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 12 Jun 2015 22:32:30 +0200
Subject: [PATCH 1/6] Move commons-cli version number to parent pom

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

diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml
index b13bbc96d..cfd5747dc 100644
--- a/dependency-check-cli/pom.xml
+++ b/dependency-check-cli/pom.xml
@@ -310,7 +310,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>org.owasp</groupId>
diff --git a/pom.xml b/pom.xml
index b56aa16ac..b8508e7e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,6 +353,11 @@ Copyright (c) 2012 - Jeremy Long
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.2</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>

From 2587ad21c06535ba735b04253d99b9954ed8fba2 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 12 Jun 2015 23:12:19 +0200
Subject: [PATCH 2/6] Add upgrade warnings/notes

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

diff --git a/pom.xml b/pom.xml
index b8508e7e4..88e70d09e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -356,6 +356,9 @@ Copyright (c) 2012 - Jeremy Long
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
+                <!-- Before upgrading to 1.3, note that this introduces several
+                deprecation warnings. Most notable OptionBuilder has been
+                marked as deprecated. Should probably be sorted out. -->
                 <version>1.2</version>
             </dependency>
             <dependency>
@@ -383,6 +386,8 @@ Copyright (c) 2012 - Jeremy Long
             <dependency>
                 <groupId>org.jmockit</groupId>
                 <artifactId>jmockit</artifactId>
+                <!-- Upgrading to 1.17 introduces build failures when building
+                with OpenJDK. -->
                 <version>1.16</version>
                 <scope>test</scope>
             </dependency>

From 581a3f8388bca5303e8f88f93fd71405fb672e60 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 12 Jun 2015 23:35:19 +0200
Subject: [PATCH 3/6] Move commons-io version number to parent pom

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

diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml
index d652995d1..6b86ed24f 100644
--- a/dependency-check-utils/pom.xml
+++ b/dependency-check-utils/pom.xml
@@ -223,7 +223,6 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 88e70d09e..2c462154b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,6 +361,11 @@ Copyright (c) 2012 - Jeremy Long
                 marked as deprecated. Should probably be sorted out. -->
                 <version>1.2</version>
             </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.4</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>

From 0130ab6356ed36ee042dd9b88501d0f84579a718 Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Fri, 12 Jun 2015 23:38:38 +0200
Subject: [PATCH 4/6] Remove commons-io version number from -core

Former-commit-id: e2085764fa4f4ead5e865fb5463523344f7ba228
---
 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 d43c65968..c32422218 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -391,7 +391,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>

From 91c05598b20407595a0f8f9b9a77543aa56a911a Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 13 Jun 2015 15:14:40 +0200
Subject: [PATCH 5/6] Move -maven depency version numbers to the parent pom

Former-commit-id: 64013140d893a6b9ed356c515a94951ad1c92dd4
---
 dependency-check-maven/pom.xml |  7 -------
 pom.xml                        | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml
index 4f87b53b1..7e93fef11 100644
--- a/dependency-check-maven/pom.xml
+++ b/dependency-check-maven/pom.xml
@@ -279,33 +279,27 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.2.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-settings</artifactId>
-            <version>3.2.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.2.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
-            <version>3.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.reporting</groupId>
             <artifactId>maven-reporting-api</artifactId>
-            <version>3.0</version>
         </dependency>
         <dependency>
             <groupId>org.jmockit</groupId>
@@ -315,7 +309,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>
-            <version>3.3.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 2c462154b..4570e31e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,6 +382,41 @@ Copyright (c) 2012 - Jeremy Long
                 <artifactId>ant-testutil</artifactId>
                 <version>1.9.5</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-core</artifactId>
+                <version>3.2.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-plugin-api</artifactId>
+                <version>3.2.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-settings</artifactId>
+                <version>3.2.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugin-testing</groupId>
+                <artifactId>maven-plugin-testing-harness</artifactId>
+                <version>3.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-annotations</artifactId>
+                <version>3.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.reporting</groupId>
+                <artifactId>maven-reporting-api</artifactId>
+                <version>3.0</version>
+            </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-core</artifactId>

From a372882c182744b18cba900b35c3e39914738ace Mon Sep 17 00:00:00 2001
From: Hans Joachim Desserud <github@desserud.org>
Date: Sat, 13 Jun 2015 15:46:39 +0200
Subject: [PATCH 6/6] Upgrade maven-core, -plugin-api and -settings
 dependencies to version 3.3.3

Former-commit-id: 92d1b4c84ccdc70bd3dd7ae29484ac546adea6b5
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4570e31e5..aef95ccf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,17 +385,17 @@ Copyright (c) 2012 - Jeremy Long
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-settings</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>