From ae51b18e2cda81fdfde5be154ec2a88355f7f906 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 2 Dec 2024 09:57:02 -0500
Subject: [PATCH 1/3] [pom] Move site items back that are for doxia 1 as we are
 not yet to doxia 2

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

diff --git a/pom.xml b/pom.xml
index 5b98a16c..c9baf42f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,13 +199,20 @@
         <plexusUtilsVersion>4.0.2</plexusUtilsVersion>
         <plexusXmlVersion>3.0.1</plexusXmlVersion>
 
+        <!-- Required for doxia 1 -->
+        <dependency-check.plugin>10.0.4</dependency-check.plugin>
+        <fluido.version>1.12.0</fluido.version>
+        <project-info.plugin>3.6.2</project-info.plugin>
+        <site.plugin>3.12.1</site.plugin>
+        <versions.plugin>2.17.1</versions.plugin>
+
         <l10nPluginVersion>1.1.0</l10nPluginVersion>
         <codenarcPluginVersion>0.22-1</codenarcPluginVersion>
         <gmavenPluginVersion>4.0.1</gmavenPluginVersion>
         <infoReportsPluginVersion>3.8.0</infoReportsPluginVersion>
         <invokerPluginVersion>3.8.1</invokerPluginVersion>
         <javadocPluginVersion>3.11.1</javadocPluginVersion>
-        <pluginPluginVersion>3.15.1</pluginPluginVersion>
+        <pluginPluginVersion>3.14.0</pluginPluginVersion>
         <scmPluginVersion>2.1.0</scmPluginVersion>
         <sitePluginVersion>3.12.1</sitePluginVersion>
         <versionsPluginVersion>2.18.0</versionsPluginVersion>

From f6a0d1d7759a5977521b4940d197368f2e480a63 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 2 Dec 2024 09:58:43 -0500
Subject: [PATCH 2/3] [pom] Adjust codenarc but skip it

codenarc doesn't work for the groovy version we are using nor does it handle modern java properly.  The plugin will need separately forked and updated to continue using, for now, just disable it as the code is pretty well written that it is not likely to complain much.
---
 pom.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c9baf42f..ca0cf81c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,6 +245,7 @@
         <beanutils.version>1.9.4</beanutils.version>
         <chain.version>1.2</chain.version>
         <codec.version>1.17.1</codec.version>
+        <codenarc.version>3.5.0-groovy-4.0</codenarc.version>
         <collections.version>3.2.2</collections.version>
         <digester.version>2.1</digester.version>
         <gson.version>2.11.0</gson.version>
@@ -666,6 +667,22 @@
                         </mapping>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>codenarc-maven-plugin</artifactId>
+                    <version>${codenarcPluginVersion}</version>
+                    <configuration>
+                        <!-- Repo https://github.com/gleclaire/codenarc-maven-plugin has been forked and will need major upgrades to use this. -->
+                        <skip>true</skip>
+                    </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codenarc</groupId>
+                            <artifactId>CodeNarc</artifactId>
+                            <version>${codenarc.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -783,11 +800,13 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>codenarc-maven-plugin</artifactId>
-                <version>${codenarcPluginVersion}</version>
                 <configuration>
+                    <codeNarcVersion>${codenarc.version}</codeNarcVersion>
+                    <groovyVersion>${groovyVersion}</groovyVersion>
                     <maxPriority1Violations>0</maxPriority1Violations>
                     <maxPriority2Violations>0</maxPriority2Violations>
                     <maxPriority3Violations>5</maxPriority3Violations>
+                    <sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
                 </configuration>
             </plugin>
             <plugin>

From 148f38342837e0736a100d81344bd603b06b675e Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 2 Dec 2024 10:24:11 -0500
Subject: [PATCH 3/3] [pom] Cleanup pom and IT tests to use common style
 property usage and clear doxia 1 support issue

---
 pom.xml                    | 7 -------
 src/it-tools/prime/pom.xml | 2 +-
 src/it/common.xml          | 4 ++--
 src/it/empty/pom.xml       | 2 +-
 src/it/multi-build/pom.xml | 2 +-
 src/it/site-brazil/pom.xml | 2 +-
 src/it/skipEmpty/pom.xml   | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca0cf81c..80727c5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,13 +209,10 @@
         <l10nPluginVersion>1.1.0</l10nPluginVersion>
         <codenarcPluginVersion>0.22-1</codenarcPluginVersion>
         <gmavenPluginVersion>4.0.1</gmavenPluginVersion>
-        <infoReportsPluginVersion>3.8.0</infoReportsPluginVersion>
         <invokerPluginVersion>3.8.1</invokerPluginVersion>
         <javadocPluginVersion>3.11.1</javadocPluginVersion>
         <pluginPluginVersion>3.14.0</pluginPluginVersion>
         <scmPluginVersion>2.1.0</scmPluginVersion>
-        <sitePluginVersion>3.12.1</sitePluginVersion>
-        <versionsPluginVersion>2.18.0</versionsPluginVersion>
 
         <spotbugsTestDebug>false</spotbugsTestDebug>
         <integrationTestSrc>${project.build.directory}/it-src-spotbugs</integrationTestSrc>
@@ -634,7 +631,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>${sitePluginVersion}</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.doxia</groupId>
@@ -782,7 +778,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>${infoReportsPluginVersion}</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -820,7 +815,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>${infoReportsPluginVersion}</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -844,7 +838,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>${versionsPluginVersion}</version>
                 <reportSets>
                     <reportSet>
                         <reports>
diff --git a/src/it-tools/prime/pom.xml b/src/it-tools/prime/pom.xml
index 297252cf..a279ba6b 100644
--- a/src/it-tools/prime/pom.xml
+++ b/src/it-tools/prime/pom.xml
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-site-plugin</artifactId>
-      <version>@sitePluginVersion@</version>
+      <version>@site.plugin@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/common.xml b/src/it/common.xml
index e5dcf45d..8027fd85 100644
--- a/src/it/common.xml
+++ b/src/it/common.xml
@@ -114,7 +114,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>@sitePluginVersion@</version>
+          <version>@site.plugin@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -132,7 +132,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>@infoReportsPluginVersion@</version>
+        <version>@project-info.plugin@</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
diff --git a/src/it/empty/pom.xml b/src/it/empty/pom.xml
index 874ac33b..6715bfdb 100644
--- a/src/it/empty/pom.xml
+++ b/src/it/empty/pom.xml
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@site.plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/multi-build/pom.xml b/src/it/multi-build/pom.xml
index c5a6be46..8a1c4daf 100644
--- a/src/it/multi-build/pom.xml
+++ b/src/it/multi-build/pom.xml
@@ -42,7 +42,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@site.plugin@</version>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/site-brazil/pom.xml b/src/it/site-brazil/pom.xml
index c4ae1be8..f9c0d5c9 100644
--- a/src/it/site-brazil/pom.xml
+++ b/src/it/site-brazil/pom.xml
@@ -38,7 +38,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@site.plugin@</version>
         <configuration>
           <locales>pt</locales>
         </configuration>
diff --git a/src/it/skipEmpty/pom.xml b/src/it/skipEmpty/pom.xml
index e8761fe6..2ba61cfd 100644
--- a/src/it/skipEmpty/pom.xml
+++ b/src/it/skipEmpty/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@sitePluginVersion@</version>
+        <version>@site.plugin@</version>
       </plugin>
     </plugins>
   </build>