From 0aa21fe77c873e3e0d6127f8c7c38caa044e6159 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Tue, 15 Aug 2017 23:39:19 -0400
Subject: [PATCH 1/3] [pom] Rework versions to all be properties, remove
 unnecessary overrides, update plexusUtils to 3.1.0

---
 pom.xml | 95 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 54 insertions(+), 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f79f37e1..9437ef65a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,21 +114,40 @@
   </distributionManagement>
 
   <properties>
-    <gmavenVersion>1.5</gmavenVersion>
-    <groovyVersion>2.4.12</groovyVersion>
-    <antVersion>1.9.9</antVersion>
-    <doxiaVersion>1.7</doxiaVersion>
-    <sitePluginVersion>3.6</sitePluginVersion>
     <project.build.java.target>1.7</project.build.java.target>
     <projectVersion>${project.version}</projectVersion>
-    <compilerPluginVersion>3.6.1</compilerPluginVersion>
-    <pluginPluginVersion>3.5</pluginPluginVersion>
+
     <findbugsVersion>3.0.1</findbugsVersion>
-    <jxrPluginVersion>2.5</jxrPluginVersion>
-    <fb-contribVersion>4.8.2</fb-contribVersion>
     <junitVersion>4.12</junitVersion>
-    <mavenSurefireVersion>2.20</mavenSurefireVersion>
-    <InfoReportsVersion>2.9</InfoReportsVersion>
+
+    <antVersion>1.9.9</antVersion>
+    <groovyVersion>2.4.12</groovyVersion>
+
+    <doxiaToolsVersion>1.4</doxiaToolsVersion>
+    <doxiaVersion>1.7</doxiaVersion>
+
+    <mavenReportingApiVersion>3.0</mavenReportingApiVersion>
+    <mavenReportingVersion>3.0.0</mavenReportingVersion>
+    <mavenVersion>3.5.0</mavenVersion>
+
+    <plexusBuildVersion>0.0.7</plexusBuildVersion>
+    <plexusContainerVersion>1.7.1</plexusContainerVersion>
+    <plexusResourcesVersion>1.1.0</plexusResourcesVersion>
+    <plexusUtilsVersion>3.1.0</plexusUtilsVersion>
+
+    <antrunPluginVersion>1.8</antrunPluginVersion>
+    <l10nPluginVersion>1.8</l10nPluginVersion>
+    <codenarcPluginVersion>0.22-1</codenarcPluginVersion>
+    <gmavenPluginVersion>1.5</gmavenPluginVersion>
+    <infoReportsPluginVersion>2.9</infoReportsPluginVersion>
+    <invokerPluginVersion>3.0.0</invokerPluginVersion>
+    <javadocPluginVersion>2.10.4</javadocPluginVersion>
+    <pluginPluginVersion>3.5</pluginPluginVersion>
+    <scmPluginVersion>1.9.5</scmPluginVersion>
+    <sitePluginVersion>3.6</sitePluginVersion>
+    <versionsPluginVersion>2.4</versionsPluginVersion>
+
+    <wagonGitsiteExtensionVersion>0.3.1</wagonGitsiteExtensionVersion>
 
     <findbugsTestDebug>false</findbugsTestDebug>
     <integrationTestSrc>${project.build.directory}/it-src-findbugs</integrationTestSrc>
@@ -179,7 +198,7 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>3.0.0</version>
+      <version>${mavenReportingVersion}</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
@@ -191,7 +210,7 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>3.0</version>
+      <version>${mavenReportingApiVersion}</version>
     </dependency>
 
     <dependency>
@@ -204,19 +223,19 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.5.0</version>
+      <version>${mavenVersion}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
-      <version>3.5.0</version>
+      <version>${mavenVersion}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>3.5.0</version>
+      <version>${mavenVersion}</version>
     </dependency>
 
     <!-- doxia -->
@@ -253,7 +272,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-doxia-tools</artifactId>
-      <version>1.4</version>
+      <version>${doxiaToolsVersion}</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
@@ -266,12 +285,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.7.1</version>
+      <version>${plexusContainerVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-resources</artifactId>
-      <version>1.1.0</version>
+      <version>${plexusResourcesVersion}</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
@@ -282,12 +301,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.24</version>
+      <version>${plexusUtilsVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.sonatype.plexus</groupId>
       <artifactId>plexus-build-api</artifactId>
-      <version>0.0.7</version>
+      <version>${plexusBuildVersion}</version>
     </dependency>
   </dependencies>
 
@@ -298,18 +317,18 @@
       <extension>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-gitexe</artifactId>
-        <version>1.9.5</version>
+        <version>${scmPluginVersion}</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-manager-plexus</artifactId>
-        <version>1.9.5</version>
+        <version>${scmPluginVersion}</version>
       </extension>
       <extension>
         <!-- note you can download this from http://github.com/khuxtable/wagon-gitsite -->
         <groupId>org.kathrynhuxtable.maven.wagon</groupId>
         <artifactId>wagon-gitsite</artifactId>
-        <version>0.3.1</version>
+        <version>${wagonGitsiteExtensionVersion}</version>
       </extension>
     </extensions>
 
@@ -349,15 +368,10 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compilerPluginVersion}</version>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
-        <version>${gmavenVersion}</version>
+        <version>${gmavenPluginVersion}</version>
         <configuration>
           <groovydocOutputDirectory>${project.reporting.outputDirectory}/apidocs</groovydocOutputDirectory>
         </configuration>
@@ -419,7 +433,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
         <configuration>
           <pushChanges>false</pushChanges>
           <localCheckout>true</localCheckout>
@@ -441,7 +454,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.4</version>
+        <version>${javadocPluginVersion}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -456,12 +469,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${InfoReportsVersion}</version>
+        <version>${infoReportsPluginVersion}</version>
       </plugin>
       <plugin>
         <groupId>com.googlecode.l10n-maven-plugin</groupId>
         <artifactId>l10n-maven-plugin</artifactId>
-        <version>1.8</version>
+        <version>${l10nPluginVersion}</version>
         <configuration>
           <locales>
             <locale>es</locale>
@@ -474,7 +487,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>codenarc-maven-plugin</artifactId>
-        <version>0.22-1</version>
+        <version>${codenarcPluginVersion}</version>
         <configuration>
           <maxPriority1Violations>0</maxPriority1Violations>
           <maxPriority2Violations>0</maxPriority2Violations>
@@ -488,7 +501,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${InfoReportsVersion}</version>
+        <version>${infoReportsPluginVersion}</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -512,7 +525,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.4</version>
+        <version>${versionsPluginVersion}</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -536,7 +549,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>3.0.0</version>
+            <version>${invokerPluginVersion}</version>
             <executions>
               <execution>
                 <id>prepare-integration-test</id>
@@ -597,7 +610,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-scm-plugin</artifactId>
-            <version>1.9.5</version>
+            <version>${scmPluginVersion}</version>
             <executions>
               <execution>
                 <id>prepare-integration-test-remote-findbugs-src</id>
@@ -621,7 +634,7 @@
               <dependency>
                 <groupId>org.apache.maven.scm</groupId>
                 <artifactId>maven-scm-provider-jgit</artifactId>
-                <version>1.9.5</version>
+                <version>${scmPluginVersion}</version>
               </dependency>
             </dependencies>
           </plugin>
@@ -642,7 +655,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
+            <version>${antrunPluginVersion}</version>
             <executions>
               <execution>
                 <id>prepare-integration-test-local-findbugs-src</id>

From f9515c7c5399a1afacdb43e84d1927df5dc2fe26 Mon Sep 17 00:00:00 2001
From: Garvin LeClaire <gleclaire@momewntfeed.com>
Date: Thu, 17 Aug 2017 09:05:48 -0400
Subject: [PATCH 2/3] Fix for broken tests

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9437ef65a..fa94d8703 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,14 @@
     <cpd.skip>true</cpd.skip>
     <checkstyle.skip>true</checkstyle.skip>
     <skipSurefireReport>true</skipSurefireReport>
+
+    <!-- Used by Integration tests -->
+    <compilerPluginVersion>3.6.1</compilerPluginVersion>
+    <fb-contribVersion>4.8.2</fb-contribVersion>
+    <jxrPluginVersion>2.5</jxrPluginVersion>
+    <mavenSurefireVersion>2.20</mavenSurefireVersion>
+
+
   </properties>
 
   <dependencies>

From f311505263d20594397cba9f347ec0b5d3e789b9 Mon Sep 17 00:00:00 2001
From: Garvin LeClaire <gleclaire@momewntfeed.com>
Date: Thu, 17 Aug 2017 09:57:07 -0400
Subject: [PATCH 3/3] Fix for broken tests

---
 src/it/common.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/it/common.xml b/src/it/common.xml
index 4d6aad958..d0321f048 100644
--- a/src/it/common.xml
+++ b/src/it/common.xml
@@ -83,7 +83,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>@InfoReportsVersion@</version>
+        <version>@infoReportsPluginVersion@</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>