Merge pull request #1029 from hazendaz/fixdoxia2

Move entirely to doxia 2

Author: hazendaz

pom.xml

@@ -180,12 +180,12 @@
         <groovyVersion>4.0.26</groovyVersion>
         <javaparserVersion>3.26.3</javaparserVersion>
 
-        <doxiaVersion>1.12.0</doxiaVersion>
-        <doxiaSiteToolsVersion>1.11.1</doxiaSiteToolsVersion>
+        <doxiaVersion>2.0.0</doxiaVersion>
+        <doxiaSiteToolsVersion>2.0.0</doxiaSiteToolsVersion>
 
         <mavenSharedUtilsVersion>3.4.2</mavenSharedUtilsVersion>
-        <mavenReportingApiVersion>3.1.1</mavenReportingApiVersion>
-        <mavenReportingVersion>3.2.0</mavenReportingVersion>
+        <mavenReportingApiVersion>4.0.0</mavenReportingApiVersion>
+        <mavenReportingVersion>4.0.0</mavenReportingVersion>
         <mavenVersion>3.9.9</mavenVersion>
 
         <resolver.version>1.9.22</resolver.version>
@@ -199,11 +199,7 @@
         <!-- TODO: Run latest dependency check as prior is throwing errors. Remove after next parent update. -->
         <dependency-check.plugin>12.1.0</dependency-check.plugin>
 
-        <!-- TODO: For running plugin, continue to use site plugin 3.12.1 -->
-        <site.doxia1.plugin note="3.21.0+ requires doxia 2">3.12.1</site.doxia1.plugin>
-
         <pluginPluginVersion>3.15.1</pluginPluginVersion>
-
         <l10nPluginVersion>1.1.0</l10nPluginVersion>
         <codenarcPluginVersion>0.22-1</codenarcPluginVersion>
         <gmavenPluginVersion>4.1.1</gmavenPluginVersion>
@@ -233,16 +229,13 @@
         <asm.version>9.7.1</asm.version>
         <bcel.version>6.10.0</bcel.version>
         <beanutils.version>1.10.1</beanutils.version>
-        <chain.version>1.2</chain.version>
         <codec.version>1.18.0</codec.version>
         <codenarc.version>3.6.0-groovy-4.0</codenarc.version>
         <collections.version>3.2.2</collections.version>
-        <digester.version>2.1</digester.version>
         <gson.version>2.12.1</gson.version>
         <inject.version>1</inject.version>
         <io.version>2.18.0</io.version>
         <jaxen.version>2.0.0</jaxen.version>
-        <lang2.version>2.6</lang2.version>
         <lang3.version>3.17.0</lang3.version>
         <logging.version>1.3.5</logging.version>
         <saxon.he.version>12.5</saxon.he.version>
@@ -321,11 +314,6 @@
                 <artifactId>commons-beanutils</artifactId>
                 <version>${beanutils.version}</version>
             </dependency>
-            <dependency>
-                <groupId>commons-chain</groupId>
-                <artifactId>commons-chain</artifactId>
-                <version>${chain.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
@@ -336,16 +324,6 @@
                 <artifactId>commons-collections</artifactId>
                 <version>${collections.version}</version>
             </dependency>
-            <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>${digester.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>${lang2.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -488,12 +466,6 @@
             <groupId>org.apache.maven.reporting</groupId>
             <artifactId>maven-reporting-impl</artifactId>
             <version>${mavenReportingVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-container-default</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -549,13 +521,6 @@
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-core</artifactId>
             <version>${doxiaVersion}</version>
-            <exclusions>
-                <!-- We don't need the plexus container default -->
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-container-default</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
@@ -567,16 +532,6 @@
             <artifactId>doxia-site-renderer</artifactId>
             <version>${doxiaSiteToolsVersion}</version>
             <exclusions>
-                <!-- Using org.dom4j instead -->
-                <exclusion>
-                    <groupId>dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
-                <!-- We don't need the plexus container default -->
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-container-default</artifactId>
-                </exclusion>
                 <!-- We don't need doxia html (using html5) -->
                 <exclusion>
                     <groupId>org.apache.maven.doxia</groupId>
@@ -588,13 +543,6 @@
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-integration-tools</artifactId>
             <version>${doxiaSiteToolsVersion}</version>
-            <exclusions>
-                <!-- We don't need the plexus container default -->
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-container-default</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- plexus -->

src/it/MFINDBUGS-178/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/basic-1/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/change-xml-filename/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/check-bug-file-multi-list/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/check-bug-file-multi/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/check-bug-file/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/check-bug-only-test-sources/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/check-fail/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>

src/it/check-failThreshold/src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -50,4 +47,4 @@
   <publishDate format="yyyy-MM-dd" position="right"/>
   <version position="right"/>
 
-</project>
+</site>