Merge pull request #948 from hazendaz/master

Make sure site is on doxia 1
spotbugs · Dec 2, 2024 · 047d96a · 047d96a
2 parents d4a12d8 + 148f383
commit 047d96a
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -199,16 +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>
 
         <spotbugsTestDebug>false</spotbugsTestDebug>
         <integrationTestSrc>${project.build.directory}/it-src-spotbugs</integrationTestSrc>
@@ -238,6 +242,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>
@@ -626,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>
@@ -659,6 +663,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>
 
@@ -758,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>
@@ -776,11 +795,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>
@@ -794,7 +815,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>${infoReportsPluginVersion}</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -818,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>