diff --git a/modello-core/src/site/site.xml b/modello-core/src/site/site.xml
index 940399641..d25ff4c53 100644
--- a/modello-core/src/site/site.xml
+++ b/modello-core/src/site/site.xml
@@ -1,11 +1,6 @@
-
-
-
- Modello
-
+
+
diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml
index ad6f50d61..14039c07f 100644
--- a/modello-maven-plugin/pom.xml
+++ b/modello-maven-plugin/pom.xml
@@ -67,6 +67,7 @@
org.apache.maven.plugin-tools
maven-plugin-annotations
+ ${mavenPluginToolsVersion}
provided
diff --git a/modello-maven-plugin/src/site/site.xml b/modello-maven-plugin/src/site/site.xml
index ec884ef4c..ed1f5285d 100644
--- a/modello-maven-plugin/src/site/site.xml
+++ b/modello-maven-plugin/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -24,4 +20,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-converters/src/site/site.xml b/modello-plugins/modello-plugin-converters/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-converters/src/site/site.xml
+++ b/modello-plugins/modello-plugin-converters/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-dom4j/src/site/site.xml b/modello-plugins/modello-plugin-dom4j/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-dom4j/src/site/site.xml
+++ b/modello-plugins/modello-plugin-dom4j/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-jackson/src/site/site.xml b/modello-plugins/modello-plugin-jackson/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-jackson/src/site/site.xml
+++ b/modello-plugins/modello-plugin-jackson/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-java/src/site/site.xml b/modello-plugins/modello-plugin-java/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-java/src/site/site.xml
+++ b/modello-plugins/modello-plugin-java/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-jdom/src/site/site.xml b/modello-plugins/modello-plugin-jdom/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-jdom/src/site/site.xml
+++ b/modello-plugins/modello-plugin-jdom/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-jsonschema/src/site/site.xml b/modello-plugins/modello-plugin-jsonschema/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-jsonschema/src/site/site.xml
+++ b/modello-plugins/modello-plugin-jsonschema/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-sax/src/site/site.xml b/modello-plugins/modello-plugin-sax/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-sax/src/site/site.xml
+++ b/modello-plugins/modello-plugin-sax/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml b/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml
+++ b/modello-plugins/modello-plugin-snakeyaml/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-stax/src/site/site.xml b/modello-plugins/modello-plugin-stax/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-stax/src/site/site.xml
+++ b/modello-plugins/modello-plugin-stax/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-velocity/src/site/site.xml b/modello-plugins/modello-plugin-velocity/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-velocity/src/site/site.xml
+++ b/modello-plugins/modello-plugin-velocity/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-xdoc/src/site/site.xml b/modello-plugins/modello-plugin-xdoc/src/site/site.xml
index 95a5b8a44..aced3d8c1 100644
--- a/modello-plugins/modello-plugin-xdoc/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xdoc/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -22,4 +18,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-xml/src/site/site.xml b/modello-plugins/modello-plugin-xml/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-xml/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xml/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-xpp3/src/site/site.xml b/modello-plugins/modello-plugin-xpp3/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-xpp3/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xpp3/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/modello-plugin-xsd/src/site/site.xml b/modello-plugins/modello-plugin-xsd/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-plugins/modello-plugin-xsd/src/site/site.xml
+++ b/modello-plugins/modello-plugin-xsd/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/modello-plugins/src/site/site.xml b/modello-plugins/src/site/site.xml
index 29c572ec4..f0e3570aa 100644
--- a/modello-plugins/src/site/site.xml
+++ b/modello-plugins/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -15,4 +11,4 @@
-
+
diff --git a/modello-test/src/site/site.xml b/modello-test/src/site/site.xml
index 940399641..368c30511 100644
--- a/modello-test/src/site/site.xml
+++ b/modello-test/src/site/site.xml
@@ -1,11 +1,7 @@
-
-
- Modello
-
+
@@ -19,4 +15,4 @@
-
+
diff --git a/pom.xml b/pom.xml
index 3f8491bb9..6c9aaad35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.codehaus.plexus
plexus
- 18
+ 19
org.codehaus.modello
diff --git a/src/site/site.xml b/src/site/site.xml
index d5de9cfd3..0aead5170 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,10 +1,8 @@
-
-
- Modello
- https://codehaus-plexus.github.io/modello/
-
+
+
+
@@ -31,4 +29,4 @@
-
+