diff --git a/pom.xml b/pom.xml
index 0968594b..f8cd823a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,30 +180,23 @@
         <groovyVersion>4.0.25</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>
         <mavenTransferVersion>0.13.1</mavenTransferVersion>
         <mavenCommonArtifactFilters>3.4.0</mavenCommonArtifactFilters>
-        <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>
 
         <plexusComponentAnnotationsVersion>2.2.0</plexusComponentAnnotationsVersion>
-        <plexusContainerVersion>2.1.1</plexusContainerVersion>
         <plexusResourcesVersion>1.3.0</plexusResourcesVersion>
         <plexusUtilsVersion>4.0.2</plexusUtilsVersion>
         <plexusVelocityVersion>2.2.0</plexusVelocityVersion>
         <plexusXmlVersion>3.0.1</plexusXmlVersion>
 
-        <dependency-check.plugin note="11.0.0+ requires doxia 2">10.0.4</dependency-check.plugin>
-        <fluido.version note="2.0.0+ requires doxia 2">1.12.0</fluido.version>
-        <pluginPluginVersion note="3.15.0+ requires doxia 2">3.14.0</pluginPluginVersion>
-        <project-info.plugin note="3.7.0+ requires doxia 2">3.6.2</project-info.plugin>
-        <site.plugin note="3.20.0+ requires doxia 2">3.12.1</site.plugin>
-        <versions.plugin note="2.18.0+ requires doxia 2">2.17.1</versions.plugin>
-
+        <pluginPluginVersion>3.15.1</pluginPluginVersion>
         <l10nPluginVersion>1.1.0</l10nPluginVersion>
         <codenarcPluginVersion>0.22-1</codenarcPluginVersion>
         <gmavenPluginVersion>4.1.1</gmavenPluginVersion>
@@ -233,16 +226,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 +311,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,21 +321,11 @@
                 <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>
-                <version>${lang3.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -495,12 +470,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>
@@ -560,13 +529,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>
@@ -578,16 +540,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>
@@ -599,13 +551,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 -->
diff --git a/src/it/MFINDBUGS-178/src/site/site.xml b/src/it/MFINDBUGS-178/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/MFINDBUGS-178/src/site/site.xml
+++ b/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>
diff --git a/src/it/basic-1/src/site/site.xml b/src/it/basic-1/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/basic-1/src/site/site.xml
+++ b/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>
diff --git a/src/it/change-xml-filename/src/site/site.xml b/src/it/change-xml-filename/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/change-xml-filename/src/site/site.xml
+++ b/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>
diff --git a/src/it/check-bug-file-multi-list/src/site/site.xml b/src/it/check-bug-file-multi-list/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-bug-file-multi-list/src/site/site.xml
+++ b/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>
diff --git a/src/it/check-bug-file-multi/src/site/site.xml b/src/it/check-bug-file-multi/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-bug-file-multi/src/site/site.xml
+++ b/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>
diff --git a/src/it/check-bug-file/src/site/site.xml b/src/it/check-bug-file/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-bug-file/src/site/site.xml
+++ b/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>
diff --git a/src/it/check-bug-only-test-sources/src/site/site.xml b/src/it/check-bug-only-test-sources/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-bug-only-test-sources/src/site/site.xml
+++ b/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>
diff --git a/src/it/check-fail/src/site/site.xml b/src/it/check-fail/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-fail/src/site/site.xml
+++ b/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>
diff --git a/src/it/check-failThreshold/src/site/site.xml b/src/it/check-failThreshold/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-failThreshold/src/site/site.xml
+++ b/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>
diff --git a/src/it/check-jvmargs/src/site/site.xml b/src/it/check-jvmargs/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-jvmargs/src/site/site.xml
+++ b/src/it/check-jvmargs/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>
diff --git a/src/it/check-multi-filter-dups/module1/src/site/site.xml b/src/it/check-multi-filter-dups/module1/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-multi-filter-dups/module1/src/site/site.xml
+++ b/src/it/check-multi-filter-dups/module1/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>
diff --git a/src/it/check-multi-filter-dups/module2/src/site/site.xml b/src/it/check-multi-filter-dups/module2/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-multi-filter-dups/module2/src/site/site.xml
+++ b/src/it/check-multi-filter-dups/module2/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>
diff --git a/src/it/check-multi-filter-dups/src/site/site.xml b/src/it/check-multi-filter-dups/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-multi-filter-dups/src/site/site.xml
+++ b/src/it/check-multi-filter-dups/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>
diff --git a/src/it/check-multi/modules/module-1/src/site/site.xml b/src/it/check-multi/modules/module-1/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-multi/modules/module-1/src/site/site.xml
+++ b/src/it/check-multi/modules/module-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>
diff --git a/src/it/check-multi/modules/module-2/src/site/site.xml b/src/it/check-multi/modules/module-2/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-multi/modules/module-2/src/site/site.xml
+++ b/src/it/check-multi/modules/module-2/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>
diff --git a/src/it/check-multi/modules/src/site/site.xml b/src/it/check-multi/modules/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-multi/modules/src/site/site.xml
+++ b/src/it/check-multi/modules/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>
diff --git a/src/it/check-multi/src/site/site.xml b/src/it/check-multi/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-multi/src/site/site.xml
+++ b/src/it/check-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>
diff --git a/src/it/check-no-missing-classes/src/site/site.xml b/src/it/check-no-missing-classes/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-no-missing-classes/src/site/site.xml
+++ b/src/it/check-no-missing-classes/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>
diff --git a/src/it/check-nofail/src/site/site.xml b/src/it/check-nofail/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-nofail/src/site/site.xml
+++ b/src/it/check-nofail/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>
diff --git a/src/it/check-pluginList-repo/src/site/site.xml b/src/it/check-pluginList-repo/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-pluginList-repo/src/site/site.xml
+++ b/src/it/check-pluginList-repo/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>
diff --git a/src/it/check-skip/src/site/site.xml b/src/it/check-skip/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-skip/src/site/site.xml
+++ b/src/it/check-skip/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>
diff --git a/src/it/check-timeout/src/site/site.xml b/src/it/check-timeout/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check-timeout/src/site/site.xml
+++ b/src/it/check-timeout/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>
diff --git a/src/it/check/src/site/site.xml b/src/it/check/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/check/src/site/site.xml
+++ b/src/it/check/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>
diff --git a/src/it/effort-default/src/site/site.xml b/src/it/effort-default/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/effort-default/src/site/site.xml
+++ b/src/it/effort-default/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>
diff --git a/src/it/effort-max/src/site/site.xml b/src/it/effort-max/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/effort-max/src/site/site.xml
+++ b/src/it/effort-max/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>
diff --git a/src/it/effort-min/src/site/site.xml b/src/it/effort-min/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/effort-min/src/site/site.xml
+++ b/src/it/effort-min/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>
diff --git a/src/it/empty/src/site/site.xml b/src/it/empty/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/empty/src/site/site.xml
+++ b/src/it/empty/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>
diff --git a/src/it/encoding-utf8/src/site/site.xml b/src/it/encoding-utf8/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/encoding-utf8/src/site/site.xml
+++ b/src/it/encoding-utf8/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>
diff --git a/src/it/exclude-modules/module1/src/site/site.xml b/src/it/exclude-modules/module1/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/exclude-modules/module1/src/site/site.xml
+++ b/src/it/exclude-modules/module1/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>
diff --git a/src/it/exclude-modules/module2/src/site/site.xml b/src/it/exclude-modules/module2/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/exclude-modules/module2/src/site/site.xml
+++ b/src/it/exclude-modules/module2/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>
diff --git a/src/it/exclude-modules/src/site/site.xml b/src/it/exclude-modules/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/exclude-modules/src/site/site.xml
+++ b/src/it/exclude-modules/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>
diff --git a/src/it/exclude-multi-list/src/site/site.xml b/src/it/exclude-multi-list/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/exclude-multi-list/src/site/site.xml
+++ b/src/it/exclude-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>
diff --git a/src/it/exclude-multi/src/site/site.xml b/src/it/exclude-multi/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/exclude-multi/src/site/site.xml
+++ b/src/it/exclude-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>
diff --git a/src/it/exclude/src/site/site.xml b/src/it/exclude/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/exclude/src/site/site.xml
+++ b/src/it/exclude/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>
diff --git a/src/it/excludeBugsFile/src/site/site.xml b/src/it/excludeBugsFile/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/excludeBugsFile/src/site/site.xml
+++ b/src/it/excludeBugsFile/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>
diff --git a/src/it/experimental/src/site/site.xml b/src/it/experimental/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/experimental/src/site/site.xml
+++ b/src/it/experimental/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>
diff --git a/src/it/html-report/src/site/site.xml b/src/it/html-report/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/html-report/src/site/site.xml
+++ b/src/it/html-report/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>
diff --git a/src/it/include-multi-list/src/site/site.xml b/src/it/include-multi-list/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/include-multi-list/src/site/site.xml
+++ b/src/it/include-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>
diff --git a/src/it/include-multi/src/site/site.xml b/src/it/include-multi/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/include-multi/src/site/site.xml
+++ b/src/it/include-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>
diff --git a/src/it/include/src/site/site.xml b/src/it/include/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/include/src/site/site.xml
+++ b/src/it/include/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>
diff --git a/src/it/maxRank/src/site/site.xml b/src/it/maxRank/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/maxRank/src/site/site.xml
+++ b/src/it/maxRank/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>
diff --git a/src/it/multi-build/modules/module-1/src/site/site.xml b/src/it/multi-build/modules/module-1/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi-build/modules/module-1/src/site/site.xml
+++ b/src/it/multi-build/modules/module-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>
diff --git a/src/it/multi-build/modules/module-2/src/site/site.xml b/src/it/multi-build/modules/module-2/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi-build/modules/module-2/src/site/site.xml
+++ b/src/it/multi-build/modules/module-2/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>
diff --git a/src/it/multi-build/modules/src/site/site.xml b/src/it/multi-build/modules/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi-build/modules/src/site/site.xml
+++ b/src/it/multi-build/modules/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>
diff --git a/src/it/multi-build/src/site/site.xml b/src/it/multi-build/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi-build/src/site/site.xml
+++ b/src/it/multi-build/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>
diff --git a/src/it/multi/modules/module-1/src/site/site.xml b/src/it/multi/modules/module-1/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi/modules/module-1/src/site/site.xml
+++ b/src/it/multi/modules/module-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>
diff --git a/src/it/multi/modules/module-2/src/site/site.xml b/src/it/multi/modules/module-2/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi/modules/module-2/src/site/site.xml
+++ b/src/it/multi/modules/module-2/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>
diff --git a/src/it/multi/modules/src/site/site.xml b/src/it/multi/modules/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi/modules/src/site/site.xml
+++ b/src/it/multi/modules/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>
diff --git a/src/it/multi/src/site/site.xml b/src/it/multi/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/multi/src/site/site.xml
+++ b/src/it/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>
diff --git a/src/it/nested/src/site/site.xml b/src/it/nested/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/nested/src/site/site.xml
+++ b/src/it/nested/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>
diff --git a/src/it/no-src/src/site/site.xml b/src/it/no-src/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/no-src/src/site/site.xml
+++ b/src/it/no-src/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>
diff --git a/src/it/no-testsrc/src/site/site.xml b/src/it/no-testsrc/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/no-testsrc/src/site/site.xml
+++ b/src/it/no-testsrc/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>
diff --git a/src/it/omitVisitors/src/site/site.xml b/src/it/omitVisitors/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/omitVisitors/src/site/site.xml
+++ b/src/it/omitVisitors/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>
diff --git a/src/it/onlyAnalyze/src/site/site.xml b/src/it/onlyAnalyze/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/onlyAnalyze/src/site/site.xml
+++ b/src/it/onlyAnalyze/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>
diff --git a/src/it/onlyAnalyzeFileSource/src/site/site.xml b/src/it/onlyAnalyzeFileSource/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/onlyAnalyzeFileSource/src/site/site.xml
+++ b/src/it/onlyAnalyzeFileSource/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>
diff --git a/src/it/pluginList-repo/src/site/site.xml b/src/it/pluginList-repo/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/pluginList-repo/src/site/site.xml
+++ b/src/it/pluginList-repo/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>
diff --git a/src/it/pluginList/src/site/site.xml b/src/it/pluginList/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/pluginList/src/site/site.xml
+++ b/src/it/pluginList/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>
diff --git a/src/it/relaxed/src/site/site.xml b/src/it/relaxed/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/relaxed/src/site/site.xml
+++ b/src/it/relaxed/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>
diff --git a/src/it/sarif-1/src/site/site.xml b/src/it/sarif-1/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/sarif-1/src/site/site.xml
+++ b/src/it/sarif-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>
diff --git a/src/it/sarif-2/src/site/site.xml b/src/it/sarif-2/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/sarif-2/src/site/site.xml
+++ b/src/it/sarif-2/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>
diff --git a/src/it/site-brazil/src/site/site.xml b/src/it/site-brazil/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/site-brazil/src/site/site.xml
+++ b/src/it/site-brazil/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>
diff --git a/src/it/site-default/src/site/site.xml b/src/it/site-default/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/site-default/src/site/site.xml
+++ b/src/it/site-default/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>
diff --git a/src/it/site-french/src/site/site.xml b/src/it/site-french/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/site-french/src/site/site.xml
+++ b/src/it/site-french/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>
diff --git a/src/it/site-spanish/src/site/site.xml b/src/it/site-spanish/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/site-spanish/src/site/site.xml
+++ b/src/it/site-spanish/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>
diff --git a/src/it/skip/src/site/site.xml b/src/it/skip/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/skip/src/site/site.xml
+++ b/src/it/skip/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>
diff --git a/src/it/skipEmpty/src/site/site.xml b/src/it/skipEmpty/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/skipEmpty/src/site/site.xml
+++ b/src/it/skipEmpty/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>
diff --git a/src/it/src/site/site.xml b/src/it/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/src/site/site.xml
+++ b/src/it/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>
diff --git a/src/it/systemPropertyVariables/src/site/site.xml b/src/it/systemPropertyVariables/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/systemPropertyVariables/src/site/site.xml
+++ b/src/it/systemPropertyVariables/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>
diff --git a/src/it/threaded/src/site/site.xml b/src/it/threaded/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/threaded/src/site/site.xml
+++ b/src/it/threaded/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>
diff --git a/src/it/threshold-experimental/src/site/site.xml b/src/it/threshold-experimental/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/threshold-experimental/src/site/site.xml
+++ b/src/it/threshold-experimental/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>
diff --git a/src/it/threshold-high/src/site/site.xml b/src/it/threshold-high/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/threshold-high/src/site/site.xml
+++ b/src/it/threshold-high/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>
diff --git a/src/it/threshold-low/src/site/site.xml b/src/it/threshold-low/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/threshold-low/src/site/site.xml
+++ b/src/it/threshold-low/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>
diff --git a/src/it/trace/src/site/site.xml b/src/it/trace/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/trace/src/site/site.xml
+++ b/src/it/trace/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>
diff --git a/src/it/userPrefs-override/src/site/site.xml b/src/it/userPrefs-override/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/userPrefs-override/src/site/site.xml
+++ b/src/it/userPrefs-override/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>
diff --git a/src/it/userPrefs/src/site/site.xml b/src/it/userPrefs/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/userPrefs/src/site/site.xml
+++ b/src/it/userPrefs/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>
diff --git a/src/it/verify-clean/src/site/site.xml b/src/it/verify-clean/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/verify-clean/src/site/site.xml
+++ b/src/it/verify-clean/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>
diff --git a/src/it/verify-fail/src/site/site.xml b/src/it/verify-fail/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/verify-fail/src/site/site.xml
+++ b/src/it/verify-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>
diff --git a/src/it/verify/src/site/site.xml b/src/it/verify/src/site/site.xml
index 8beace44..3b094d9e 100644
--- a/src/it/verify/src/site/site.xml
+++ b/src/it/verify/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>
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy
index 06453dcd..91801a72 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy
@@ -21,16 +21,9 @@ import groovy.xml.XmlSlurper
 import javax.inject.Inject
 
 import org.apache.commons.io.FileUtils
-import org.apache.maven.doxia.siterenderer.Renderer
-import org.apache.maven.doxia.tools.SiteTool
-import org.apache.maven.execution.MavenSession
 import org.apache.maven.plugin.AbstractMojo
 import org.apache.maven.plugin.MojoExecutionException
-import org.apache.maven.plugins.annotations.Execute
-import org.apache.maven.plugins.annotations.LifecyclePhase
-import org.apache.maven.plugins.annotations.Mojo
 import org.apache.maven.plugins.annotations.Parameter
-import org.apache.maven.plugins.annotations.ResolutionScope
 import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver
 import org.codehaus.plexus.resource.ResourceManager
 
@@ -72,10 +65,6 @@ abstract class BaseViolationCheckMojo extends AbstractMojo {
     @Parameter(defaultValue = 'spotbugsXml.xml', property = 'spotbugs.outputXmlFilename')
     String spotbugsXmlOutputFilename
 
-    /** Doxia Site Renderer. */
-    @Inject
-    Renderer siteRenderer
-
     /** Directory containing the class files for Spotbugs to analyze. */
     @Parameter(defaultValue = '${project.build.outputDirectory}', required = true)
     File classFilesDirectory
@@ -104,10 +93,6 @@ abstract class BaseViolationCheckMojo extends AbstractMojo {
     @Parameter(property = 'plugin.artifacts', readonly = true, required = true)
     List pluginArtifacts
 
-    /** Maven Session. */
-    @Parameter (defaultValue = '${session}', readonly = true, required = true)
-    MavenSession session
-
     /**
      * The file encoding to use when reading the source files. If the property <code>project.build.sourceEncoding</code>
      * is not set, the platform default encoding is used.
@@ -288,14 +273,6 @@ abstract class BaseViolationCheckMojo extends AbstractMojo {
     @Inject
     ResourceManager resourceManager
 
-    /**
-     * SiteTool.
-     *
-     * @since 2.1
-     */
-    @Inject
-    SiteTool siteTool
-
     /**
      * Fail the build on an error.
      *
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 2a5aedae..47328104 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -22,8 +22,6 @@ import groovy.xml.XmlSlurper
 import groovy.xml.slurpersupport.GPathResult
 import groovy.xml.StreamingMarkupBuilder
 
-import org.apache.maven.doxia.siterenderer.Renderer
-import org.apache.maven.doxia.tools.SiteTool
 import org.apache.maven.execution.MavenSession
 import org.apache.maven.plugin.MojoExecutionException
 import org.apache.maven.plugins.annotations.Mojo
@@ -138,10 +136,6 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
     @Parameter(defaultValue = 'spotbugsXml.xml', property = 'spotbugs.outputXmlFilename')
     String spotbugsXmlOutputFilename
 
-    /** Doxia Site Renderer. */
-    @Inject
-    Renderer siteRenderer
-
     /** Directory containing the class files for Spotbugs to analyze. */
     @Parameter(defaultValue = '${project.build.outputDirectory}', required = true)
     File classFilesDirectory
@@ -421,14 +415,6 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
     @Inject
     ResourceManager resourceManager
 
-    /**
-     * SiteTool.
-     *
-     * @since 2.1
-     */
-    @Inject
-    SiteTool siteTool
-
     /**
      * Fail the build on an error.
      *
@@ -670,7 +656,6 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
         }
     }
 
-    @Override
     public void execute() {
         log.debug('****** SpotBugsMojo execute *******')
 
@@ -732,15 +717,6 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
         return outputDirectory.getAbsolutePath()
     }
 
-    /**
-     * Return the Site Renderer.
-     *
-     */
-    @Override
-    protected Renderer getSiteRenderer() {
-        return this.siteRenderer
-    }
-
     /**
      * Determines if the JXR-Plugin is included in the report section of the POM.
      *
diff --git a/src/site/site.xml b/src/site/site.xml
index 57b1781d..b64e6f52 100644
--- a/src/site/site.xml
+++ b/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>
@@ -75,4 +72,4 @@
     </menu>
     <menu ref="reports" />
   </body>
-</project>
+</site>