diff --git a/pom.xml b/pom.xml
index 64e2d259..de509371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,17 +184,16 @@
4.0.24
3.26.2
- 1.12.0
- 1.11.1
+ 2.0.0
+ 2.0.0
3.4.2
0.13.1
3.4.0
- 3.1.1
- 3.2.0
+ 4.0.0
+ 4.0.0
3.9.9
- 2.1.1
1.3.0
4.0.2
3.0.1
@@ -208,7 +207,7 @@
3.11.1
3.15.1
2.1.0
- 3.12.1
+ 3.20.0
2.17.1
false
@@ -237,15 +236,12 @@
9.7.1
6.10.0
1.9.4
- 1.2
1.17.1
3.2.2
- 2.1
2.11.0
33.3.1-jre
2.17.0
2.0.0
- 2.6
3.17.0
@@ -427,12 +423,6 @@
org.apache.maven.reporting
maven-reporting-impl
${mavenReportingVersion}
-
-
- org.codehaus.plexus
- plexus-container-default
-
-
@@ -496,16 +486,6 @@
org.apache.maven.doxia
doxia-core
${doxiaVersion}
-
-
- commons-logging
- commons-logging
-
-
- org.codehaus.plexus
- plexus-container-default
-
-
org.apache.maven.doxia
@@ -514,7 +494,7 @@
org.apache.maven.doxia
- doxia-decoration-model
+ doxia-site-model
${doxiaSiteToolsVersion}
@@ -526,26 +506,12 @@
commons-logging
commons-logging
-
- dom4j
- dom4j
-
-
- org.codehaus.plexus
- plexus-container-default
-
org.apache.maven.doxia
doxia-integration-tools
${doxiaSiteToolsVersion}
-
-
- org.codehaus.plexus
- plexus-container-default
-
-
@@ -560,11 +526,6 @@
-
- commons-chain
- commons-chain
- ${chain.version}
-
commons-codec
commons-codec
@@ -575,27 +536,11 @@
commons-collections
${collections.version}
-
- commons-digester
- commons-digester
- ${digester.version}
-
-
- commons-logging
- commons-logging
-
-
-
commons-io
commons-io
${io.version}
-
- commons-lang
- commons-lang
- ${lang2.version}
-
org.apache.commons
commons-lang3
diff --git a/src/it/MFINDBUGS-178/src/site/site.xml b/src/it/MFINDBUGS-178/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/MFINDBUGS-178/src/site/site.xml
+++ b/src/it/MFINDBUGS-178/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/basic-1/src/site/site.xml b/src/it/basic-1/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/basic-1/src/site/site.xml
+++ b/src/it/basic-1/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/change-xml-filename/src/site/site.xml b/src/it/change-xml-filename/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/change-xml-filename/src/site/site.xml
+++ b/src/it/change-xml-filename/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 100644
--- a/src/it/check-bug-file-multi/src/site/site.xml
+++ b/src/it/check-bug-file-multi/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-bug-file/src/site/site.xml b/src/it/check-bug-file/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-bug-file/src/site/site.xml
+++ b/src/it/check-bug-file/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-fail/src/site/site.xml b/src/it/check-fail/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-fail/src/site/site.xml
+++ b/src/it/check-fail/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-failThreshold/src/site/site.xml b/src/it/check-failThreshold/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-failThreshold/src/site/site.xml
+++ b/src/it/check-failThreshold/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-jvmargs/src/site/site.xml b/src/it/check-jvmargs/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-jvmargs/src/site/site.xml
+++ b/src/it/check-jvmargs/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 100644
--- a/src/it/check-multi-filter-dups/src/site/site.xml
+++ b/src/it/check-multi-filter-dups/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-multi/modules/src/site/site.xml b/src/it/check-multi/modules/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-multi/modules/src/site/site.xml
+++ b/src/it/check-multi/modules/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-multi/src/site/site.xml b/src/it/check-multi/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-multi/src/site/site.xml
+++ b/src/it/check-multi/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 100644
--- a/src/it/check-no-missing-classes/src/site/site.xml
+++ b/src/it/check-no-missing-classes/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-nofail/src/site/site.xml b/src/it/check-nofail/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-nofail/src/site/site.xml
+++ b/src/it/check-nofail/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-pluginList-repo/src/site/site.xml b/src/it/check-pluginList-repo/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-pluginList-repo/src/site/site.xml
+++ b/src/it/check-pluginList-repo/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-skip/src/site/site.xml b/src/it/check-skip/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-skip/src/site/site.xml
+++ b/src/it/check-skip/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check-timeout/src/site/site.xml b/src/it/check-timeout/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check-timeout/src/site/site.xml
+++ b/src/it/check-timeout/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/check/src/site/site.xml b/src/it/check/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/check/src/site/site.xml
+++ b/src/it/check/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/effort-default/src/site/site.xml b/src/it/effort-default/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/effort-default/src/site/site.xml
+++ b/src/it/effort-default/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/effort-max/src/site/site.xml b/src/it/effort-max/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/effort-max/src/site/site.xml
+++ b/src/it/effort-max/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/effort-min/src/site/site.xml b/src/it/effort-min/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/effort-min/src/site/site.xml
+++ b/src/it/effort-min/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/empty/src/site/site.xml b/src/it/empty/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/empty/src/site/site.xml
+++ b/src/it/empty/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/encoding-utf8/src/site/site.xml b/src/it/encoding-utf8/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/encoding-utf8/src/site/site.xml
+++ b/src/it/encoding-utf8/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/exclude-modules/module1/src/site/site.xml b/src/it/exclude-modules/module1/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/exclude-modules/module1/src/site/site.xml
+++ b/src/it/exclude-modules/module1/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/exclude-modules/module2/src/site/site.xml b/src/it/exclude-modules/module2/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/exclude-modules/module2/src/site/site.xml
+++ b/src/it/exclude-modules/module2/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/exclude-modules/src/site/site.xml b/src/it/exclude-modules/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/exclude-modules/src/site/site.xml
+++ b/src/it/exclude-modules/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/exclude-multi-list/src/site/site.xml b/src/it/exclude-multi-list/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/exclude-multi-list/src/site/site.xml
+++ b/src/it/exclude-multi-list/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/exclude-multi/src/site/site.xml b/src/it/exclude-multi/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/exclude-multi/src/site/site.xml
+++ b/src/it/exclude-multi/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/exclude/src/site/site.xml b/src/it/exclude/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/exclude/src/site/site.xml
+++ b/src/it/exclude/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/excludeBugsFile/src/site/site.xml b/src/it/excludeBugsFile/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/excludeBugsFile/src/site/site.xml
+++ b/src/it/excludeBugsFile/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/experimental/src/site/site.xml b/src/it/experimental/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/experimental/src/site/site.xml
+++ b/src/it/experimental/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/html-report/src/site/site.xml b/src/it/html-report/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/html-report/src/site/site.xml
+++ b/src/it/html-report/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/include-multi-list/src/site/site.xml b/src/it/include-multi-list/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/include-multi-list/src/site/site.xml
+++ b/src/it/include-multi-list/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/include-multi/src/site/site.xml b/src/it/include-multi/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/include-multi/src/site/site.xml
+++ b/src/it/include-multi/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/include/src/site/site.xml b/src/it/include/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/include/src/site/site.xml
+++ b/src/it/include/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/maxRank/src/site/site.xml b/src/it/maxRank/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/maxRank/src/site/site.xml
+++ b/src/it/maxRank/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 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
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/multi-build/modules/src/site/site.xml b/src/it/multi-build/modules/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/multi-build/modules/src/site/site.xml
+++ b/src/it/multi-build/modules/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/multi-build/src/site/site.xml b/src/it/multi-build/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/multi-build/src/site/site.xml
+++ b/src/it/multi-build/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 100644
--- a/src/it/multi/modules/module-1/src/site/site.xml
+++ b/src/it/multi/modules/module-1/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
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 c44c6805..370deed2 100644
--- a/src/it/multi/modules/module-2/src/site/site.xml
+++ b/src/it/multi/modules/module-2/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/multi/modules/src/site/site.xml b/src/it/multi/modules/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/multi/modules/src/site/site.xml
+++ b/src/it/multi/modules/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/multi/src/site/site.xml b/src/it/multi/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/multi/src/site/site.xml
+++ b/src/it/multi/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/nested/src/site/site.xml b/src/it/nested/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/nested/src/site/site.xml
+++ b/src/it/nested/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/no-src/src/site/site.xml b/src/it/no-src/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/no-src/src/site/site.xml
+++ b/src/it/no-src/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/no-testsrc/src/site/site.xml b/src/it/no-testsrc/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/no-testsrc/src/site/site.xml
+++ b/src/it/no-testsrc/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/omitVisitors/src/site/site.xml b/src/it/omitVisitors/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/omitVisitors/src/site/site.xml
+++ b/src/it/omitVisitors/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/onlyAnalyze/src/site/site.xml b/src/it/onlyAnalyze/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/onlyAnalyze/src/site/site.xml
+++ b/src/it/onlyAnalyze/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/onlyAnalyzeFileSource/src/site/site.xml b/src/it/onlyAnalyzeFileSource/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/onlyAnalyzeFileSource/src/site/site.xml
+++ b/src/it/onlyAnalyzeFileSource/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/pluginList-repo/src/site/site.xml b/src/it/pluginList-repo/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/pluginList-repo/src/site/site.xml
+++ b/src/it/pluginList-repo/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/pluginList/src/site/site.xml b/src/it/pluginList/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/pluginList/src/site/site.xml
+++ b/src/it/pluginList/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/relaxed/src/site/site.xml b/src/it/relaxed/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/relaxed/src/site/site.xml
+++ b/src/it/relaxed/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/sarif-1/src/site/site.xml b/src/it/sarif-1/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/sarif-1/src/site/site.xml
+++ b/src/it/sarif-1/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/sarif-2/src/site/site.xml b/src/it/sarif-2/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/sarif-2/src/site/site.xml
+++ b/src/it/sarif-2/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/site-brazil/src/site/site.xml b/src/it/site-brazil/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/site-brazil/src/site/site.xml
+++ b/src/it/site-brazil/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/site-default/src/site/site.xml b/src/it/site-default/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/site-default/src/site/site.xml
+++ b/src/it/site-default/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/site-french/src/site/site.xml b/src/it/site-french/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/site-french/src/site/site.xml
+++ b/src/it/site-french/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/site-spanish/src/site/site.xml b/src/it/site-spanish/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/site-spanish/src/site/site.xml
+++ b/src/it/site-spanish/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/skip/src/site/site.xml b/src/it/skip/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/skip/src/site/site.xml
+++ b/src/it/skip/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/skipEmpty/src/site/site.xml b/src/it/skipEmpty/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/skipEmpty/src/site/site.xml
+++ b/src/it/skipEmpty/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/src/site/site.xml b/src/it/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/src/site/site.xml
+++ b/src/it/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/systemPropertyVariables/src/site/site.xml b/src/it/systemPropertyVariables/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/systemPropertyVariables/src/site/site.xml
+++ b/src/it/systemPropertyVariables/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/threaded/src/site/site.xml b/src/it/threaded/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/threaded/src/site/site.xml
+++ b/src/it/threaded/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/threshold-experimental/src/site/site.xml b/src/it/threshold-experimental/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/threshold-experimental/src/site/site.xml
+++ b/src/it/threshold-experimental/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/threshold-high/src/site/site.xml b/src/it/threshold-high/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/threshold-high/src/site/site.xml
+++ b/src/it/threshold-high/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/threshold-low/src/site/site.xml b/src/it/threshold-low/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/threshold-low/src/site/site.xml
+++ b/src/it/threshold-low/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/trace/src/site/site.xml b/src/it/trace/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/trace/src/site/site.xml
+++ b/src/it/trace/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/userPrefs-override/src/site/site.xml b/src/it/userPrefs-override/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/userPrefs-override/src/site/site.xml
+++ b/src/it/userPrefs-override/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/userPrefs/src/site/site.xml b/src/it/userPrefs/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/userPrefs/src/site/site.xml
+++ b/src/it/userPrefs/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/verify-clean/src/site/site.xml b/src/it/verify-clean/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/verify-clean/src/site/site.xml
+++ b/src/it/verify-clean/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/verify-fail/src/site/site.xml b/src/it/verify-fail/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/verify-fail/src/site/site.xml
+++ b/src/it/verify-fail/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/it/verify/src/site/site.xml b/src/it/verify/src/site/site.xml
index c44c6805..370deed2 100644
--- a/src/it/verify/src/site/site.xml
+++ b/src/it/verify/src/site/site.xml
@@ -1,7 +1,7 @@
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -50,4 +47,4 @@
-
+
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy
index 5a8daca7..add8a2bc 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 project.build.sourceEncoding
* 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 730ff8ad..c7c923be 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,19 +656,6 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
}
- @Override
- public void execute() {
- log.debug('****** SpotBugsMojo execute *******')
-
- if (!skip) {
- executeCheck()
- if (canGenerateReport()) {
- Locale locale = Locale.getDefault()
- generateXDoc(locale)
- }
- }
- }
-
private void executeCheck() {
log.debug('****** SpotBugsMojo executeCheck *******')
@@ -732,15 +705,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 6d0af4b0..41f36dae 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -16,18 +16,15 @@
limitations under the License.
-->
-
+
-
- SpotBugs Maven Plugin
-
+
org.apache.maven.skins
maven-fluido-skin
- 1.12.0
+ 2.0.0-M11
@@ -75,4 +72,4 @@