From 959f23807ae6cbab6bf573f83595ad99119b9362 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 17:21:17 -0400
Subject: [PATCH 01/10] [pom] Bump version of project to 4.7.1.0 snapshot

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 81549348..f1510954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>com.github.spotbugs</groupId>
   <artifactId>spotbugs-maven-plugin</artifactId>
-  <version>4.7.0.1-SNAPSHOT</version>
+  <version>4.7.1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>SpotBugs Maven Plugin</name>

From 09fd232697c441c996f4274dca7d9edc8ba1b947 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 00:06:08 -0400
Subject: [PATCH 02/10] [pom] Add versions into build tools pom

---
 src/it-tools/build-tools/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/it-tools/build-tools/pom.xml b/src/it-tools/build-tools/pom.xml
index 61744c13..fa654071 100644
--- a/src/it-tools/build-tools/pom.xml
+++ b/src/it-tools/build-tools/pom.xml
@@ -30,6 +30,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>@compilerPluginVersion@</version>
         <configuration>
           <debug>false</debug>
           <source>1.8</source>
@@ -48,6 +49,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>@mavenSurefireVersion@</version>
         <configuration>
           <skipTests>true</skipTests>
         </configuration>

From b42c3dde1bc0ea7b9f1fa37f67f696d07499f174 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 17:32:21 -0400
Subject: [PATCH 03/10] [pom] Bump surefire to 3.0.0-M7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f1510954..0b995847 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
     <compilerPluginVersion>3.10.1</compilerPluginVersion>
     <findsecbugsVersion>1.12.0</findsecbugsVersion>
     <jxrPluginVersion>3.2.0</jxrPluginVersion>
-    <mavenSurefireVersion>3.0.0-M6</mavenSurefireVersion>
+    <mavenSurefireVersion>3.0.0-M7</mavenSurefireVersion>
     <jakartaeeApiVersion>8.0.0</jakartaeeApiVersion>
     <servletApiVersion>4.0.4</servletApiVersion>
     <sb-contribVersion>7.4.7</sb-contribVersion>

From 6366723267ff00ca12628e45b44ea8b5eef835e9 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Thu, 30 Jun 2022 00:30:56 -0400
Subject: [PATCH 04/10] [pom] Bump maven common artifacts filters back to 3.3.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0b995847..dbf3d984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
     <mavenCoreVersion>3.8.6</mavenCoreVersion>
     <mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
     <mavenTransferVersion>0.13.1</mavenTransferVersion>
-    <mavenCommonArtifactFilters>3.2.0</mavenCommonArtifactFilters>
+    <mavenCommonArtifactFilters>3.3.0</mavenCommonArtifactFilters>
     <mavenReportingApiVersion>3.1.0</mavenReportingApiVersion>
     <mavenReportingVersion>3.1.0</mavenReportingVersion>
     <mavenVersion>3.8.6</mavenVersion>

From 3ed4ae38451135446deda4e06b110741b4d4cda8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 17:51:14 -0400
Subject: [PATCH 05/10] [pom] Add asm bom to enforce asm version to 9.3

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

diff --git a/pom.xml b/pom.xml
index dbf3d984..ef212035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,6 +197,13 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm-bom</artifactId>
+        <version>${asm.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.groovy</groupId>
         <artifactId>groovy-bom</artifactId>

From e6f353f4449605fa6babbf569ac4fe980e93b587 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 19:22:50 -0400
Subject: [PATCH 06/10] [pom] Add better control of plugins to be recent in
 'it' tests

will still pick up old where its not calling out the parent setup which is ok.
---
 src/it-tools/build-tools/pom.xml | 56 ++++++++++++++++++++++++++++++++
 src/it-tools/prime/pom.xml       | 53 ++++++++++++++++++++++++++++++
 src/it/common.xml                | 53 ++++++++++++++++++++++++++++++
 3 files changed, 162 insertions(+)

diff --git a/src/it-tools/build-tools/pom.xml b/src/it-tools/build-tools/pom.xml
index fa654071..5a2d6325 100644
--- a/src/it-tools/build-tools/pom.xml
+++ b/src/it-tools/build-tools/pom.xml
@@ -26,6 +26,62 @@
   <version>testing</version>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <!-- Override plugins to latest -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>@antrun.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>@assembly.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>@clean.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>@dependency.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>@deploy.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>@install.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>@jar.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>@release.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>@resources.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>@jxr.plugin@</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it-tools/prime/pom.xml b/src/it-tools/prime/pom.xml
index 0e0f4ce4..0b6d1ab2 100644
--- a/src/it-tools/prime/pom.xml
+++ b/src/it-tools/prime/pom.xml
@@ -26,6 +26,59 @@
   <version>testing</version>
 
   <dependencies>
+    <!-- Override plugins to latest -->
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-antrun-plugin</artifactId>
+      <version>@antrun.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-assembly-plugin</artifactId>
+      <version>@assembly.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-clean-plugin</artifactId>
+      <version>@clean.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-dependency-plugin</artifactId>
+      <version>@dependency.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-deploy-plugin</artifactId>
+      <version>@deploy.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-install-plugin</artifactId>
+      <version>@install.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-jar-plugin</artifactId>
+      <version>@jar.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-release-plugin</artifactId>
+      <version>@release.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-resources-plugin</artifactId>
+      <version>@resources.plugin@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-jxr-plugin</artifactId>
+      <version>@jxr.plugin@</version>
+    </dependency>
+
+    <!-- Required plugins -->
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs</artifactId>
diff --git a/src/it/common.xml b/src/it/common.xml
index 15a264fa..b4b121ac 100644
--- a/src/it/common.xml
+++ b/src/it/common.xml
@@ -57,6 +57,59 @@
     <testSourceDirectory>@project.basedir@/src/it-src/test/java</testSourceDirectory>
     <pluginManagement>
       <plugins>
+        <!-- Override plugins to latest -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>@antrun.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>@assembly.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>@clean.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>@dependency.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>@deploy.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>@install.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>@jar.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>@release.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>@resources.plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>@jxr.plugin@</version>
+        </plugin>
+
+        <!-- Required plugins -->
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>

From c73479aedcf43c925c7f072ab7c2d58f0dd3fd3f Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 19:24:13 -0400
Subject: [PATCH 07/10] [pom] As asm now bom, remove duplicate version
 declarations

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef212035..ebd53526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,27 +520,22 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>${asm.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-analysis</artifactId>
-      <version>${asm.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-commons</artifactId>
-      <version>${asm.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>${asm.version}</version>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-util</artifactId>
-      <version>${asm.version}</version>
     </dependency>
   </dependencies>
 

From 21453a33a7bdf620446dd0a2044bee81fb6e9318 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 19:29:33 -0400
Subject: [PATCH 08/10] [pom] Formatting

---
 src/it/systemPropertyVariables/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/it/systemPropertyVariables/pom.xml b/src/it/systemPropertyVariables/pom.xml
index e2d90132..712126d8 100644
--- a/src/it/systemPropertyVariables/pom.xml
+++ b/src/it/systemPropertyVariables/pom.xml
@@ -34,8 +34,7 @@
         <artifactId>spotbugs-maven-plugin</artifactId>
         <configuration>
           <systemPropertyVariables>
-            <findsecbugs.taint.taintedsystemvariables>true
-            </findsecbugs.taint.taintedsystemvariables>
+            <findsecbugs.taint.taintedsystemvariables>true</findsecbugs.taint.taintedsystemvariables>
           </systemPropertyVariables>
           <spotbugsXmlOutput>true</spotbugsXmlOutput>
           <xmlOutput>true</xmlOutput>

From ffbbf4d2e2b94e92c0b197c0e91ad792f558d452 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 19:37:06 -0400
Subject: [PATCH 09/10] [pom] More formatting

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

diff --git a/src/it/skipEmpty/pom.xml b/src/it/skipEmpty/pom.xml
index 2e1ad72a..0d61e5ff 100644
--- a/src/it/skipEmpty/pom.xml
+++ b/src/it/skipEmpty/pom.xml
@@ -16,7 +16,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-<modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <!-- Parent is disabled on purpose
   <parent>

From b95221987fd0bcc200000b046fc1f925a6287b0c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 4 Jul 2022 20:47:33 -0400
Subject: [PATCH 10/10] [pom] Order 'asm' first to overcome issues with maven
 changes

recently maven is moving away from supplying in compile scope maven artifacts.  With the common filter that changed behaviour of the build here where asm was pulling 3.3.1 and not 9.3.  Moved this to occur before groovy and maven artifacts as well as the bom addition to overcome these issues.
---
 pom.xml | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index ebd53526..c8effa70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,28 @@
       <version>${slf4jVersion}</version>
     </dependency>
 
+    <!-- asm -->
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+    </dependency>
+
     <!-- gmaven -->
     <dependency>
       <groupId>org.apache.ant</groupId>
@@ -515,28 +537,6 @@
       <artifactId>plexus-utils</artifactId>
       <version>${plexusUtilsVersion}</version>
     </dependency>
-
-    <!-- Better jdk support -->
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-util</artifactId>
-    </dependency>
   </dependencies>
 
   <build>