This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch site-model-rework
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit a88563f8b42767e7fc05217c5d6ef6b72f2519a6
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Tue Jun 27 09:24:19 2023 +0200
Site Model Rework
---
src/it/projects/MSITE-159/src/site/site.xml | 7 +++---
src/it/projects/MSITE-265/src/site/site.xml | 8 +++----
src/it/projects/MSITE-458/src/site/site.xml | 6 +++--
src/it/projects/MSITE-497/src/site/site.xml | 7 +++---
src/it/projects/MSITE-566/src/site/site.xml | 7 +++---
src/it/projects/MSITE-582/child/src/site/site.xml | 8 +++----
src/it/projects/MSITE-582/src/site/site.xml | 8 +++----
src/it/projects/MSITE-609/src/site/site.xml | 8 +++----
src/it/projects/MSITE-658/src/site/site.xml | 8 +++----
src/it/projects/MSITE-658/src/site/site_de.xml | 8 +++----
.../projects/MSITE-842/project/src/site/site.xml | 7 +++---
src/it/projects/MSITE-856/src/site/site.xml | 8 +++----
src/it/projects/MSITE-856/src/site/site_de.xml | 8 +++----
src/it/projects/doxia-formats/src/site/site.xml | 9 ++++---
src/it/projects/doxia-formats/src/site/site_de.xml | 9 ++++---
src/it/projects/effective-site/src/site/site.xml | 8 +++----
.../repo-parent/src/site/site.xml | 12 ++++------
.../childAsRef/grandChildAsRef/src/site/site.xml | 6 +++--
.../parentAsRef/childAsRef/src/site/site.xml | 6 +++--
.../inheritedMenus/parentAsRef/src/site/site.xml | 7 +++---
.../grandChildNotAsRef/src/site/site.xml | 6 +++--
.../parentNotAsRef/childNotAsRef/src/site/site.xml | 7 +++---
.../parentNotAsRef/src/site/site.xml | 6 +++--
.../site-attach-descriptor/child/src/site/site.xml | 8 +++----
.../site-attach-descriptor/src/site/site.xml | 8 +++----
.../site-attach-descriptor/src/site/site_sv.xml | 8 +++----
src/it/projects/site-deploy/src/site/site.xml | 8 +++----
.../child_and_module/src/site/site.xml | 7 +++---
.../inheriting_child/src/site/site.xml | 7 +++---
.../site-inheritance/module/src/site/site.xml | 7 +++---
.../site-inheritance/parent/src/site/site.xml | 7 +++---
.../site-inheritance/sub_module/src/site/site.xml | 7 +++---
src/it/projects/site-jar/src/site/site.xml | 8 +++----
.../site-sd-lang/mymodule/src/site/site.xml | 28 ++++++++++++----------
.../site-sd-lang/mymodule/src/site/site_fr.xml | 28 ++++++++++++----------
src/it/projects/site-sd-lang/src/site/site.xml | 6 +++--
.../projects/site-sd-lang/src/site/site_de_AT.xml | 6 +++--
.../projects/site-sd-lang/src/site/site_de_DE.xml | 6 +++--
src/it/projects/site-sd-lang/src/site/site_fr.xml | 6 +++--
src/it/projects/site-sd/src/site/site.xml | 8 +++----
src/it/projects/template-skin/src/site/site.xml | 7 +++---
src/it/projects/validate/src/site/site.xml | 15 ++++++------
.../plugins/site/descriptor/EffectiveSiteMojo.java | 2 +-
43 files changed, 195 insertions(+), 166 deletions(-)
diff --git a/src/it/projects/MSITE-159/src/site/site.xml
b/src/it/projects/MSITE-159/src/site/site.xml
index e0d61b02..5117797b 100644
--- a/src/it/projects/MSITE-159/src/site/site.xml
+++ b/src/it/projects/MSITE-159/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -40,4 +41,4 @@ under the License.
<item name="Menu" href="http://webhost.company.com/"/>
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-265/src/site/site.xml
b/src/it/projects/MSITE-265/src/site/site.xml
index 3db39072..3dbd8374 100644
--- a/src/it/projects/MSITE-265/src/site/site.xml
+++ b/src/it/projects/MSITE-265/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="MSITE-265">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-458/src/site/site.xml
b/src/it/projects/MSITE-458/src/site/site.xml
index d901a162..f4bd950d 100644
--- a/src/it/projects/MSITE-458/src/site/site.xml
+++ b/src/it/projects/MSITE-458/src/site/site.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -28,4 +30,4 @@ under the License.
<body>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-497/src/site/site.xml
b/src/it/projects/MSITE-497/src/site/site.xml
index 50b563bc..ebd094f4 100644
--- a/src/it/projects/MSITE-497/src/site/site.xml
+++ b/src/it/projects/MSITE-497/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -35,4 +36,4 @@ under the License.
<!--<item name="Xdoc Example" href="xdoc.html"/>-->
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-566/src/site/site.xml
b/src/it/projects/MSITE-566/src/site/site.xml
index 694ea926..c11e69dc 100644
--- a/src/it/projects/MSITE-566/src/site/site.xml
+++ b/src/it/projects/MSITE-566/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}"
xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -32,4 +33,4 @@ under the License.
<!-- a comment -->
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-582/child/src/site/site.xml
b/src/it/projects/MSITE-582/child/src/site/site.xml
index 6dfcf6a8..7a2df146 100644
--- a/src/it/projects/MSITE-582/child/src/site/site.xml
+++ b/src/it/projects/MSITE-582/child/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -35,4 +35,4 @@ under the License.
<item name="O" href="A/B/C/M/N/O"/>
</breadcrumbs>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-582/src/site/site.xml
b/src/it/projects/MSITE-582/src/site/site.xml
index d8b9ccfb..9de237a6 100644
--- a/src/it/projects/MSITE-582/src/site/site.xml
+++ b/src/it/projects/MSITE-582/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -37,4 +37,4 @@ under the License.
<item name="F" href="A/B/C/D/E/F"/>
</breadcrumbs>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-609/src/site/site.xml
b/src/it/projects/MSITE-609/src/site/site.xml
index 3db39072..e2cf9124 100644
--- a/src/it/projects/MSITE-609/src/site/site.xml
+++ b/src/it/projects/MSITE-609/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="MSITE-609">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-658/src/site/site.xml
b/src/it/projects/MSITE-658/src/site/site.xml
index 415fc2ca..08fa53af 100644
--- a/src/it/projects/MSITE-658/src/site/site.xml
+++ b/src/it/projects/MSITE-658/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0
http://maven.apache.org/xsd/decoration-1.3.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -33,4 +33,4 @@ under the License.
<item name="Home"
href="http://maven.apache.org/sub-directory/index.html"/>
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-658/src/site/site_de.xml
b/src/it/projects/MSITE-658/src/site/site_de.xml
index 83498f62..2aca99bf 100644
--- a/src/it/projects/MSITE-658/src/site/site_de.xml
+++ b/src/it/projects/MSITE-658/src/site/site_de.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0
http://maven.apache.org/xsd/decoration-1.3.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -33,4 +33,4 @@ under the License.
<item name="Heim"
href="http://maven.apache.org/sub-directory/de/index.html"/>
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-842/project/src/site/site.xml
b/src/it/projects/MSITE-842/project/src/site/site.xml
index 46939e5e..69ffb51d 100644
--- a/src/it/projects/MSITE-842/project/src/site/site.xml
+++ b/src/it/projects/MSITE-842/project/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>MSITE-842-skin</artifactId>
@@ -36,4 +37,4 @@ under the License.
<!--<item name="Xdoc Example" href="xdoc.html"/>-->
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-856/src/site/site.xml
b/src/it/projects/MSITE-856/src/site/site.xml
index b563671d..3610d5cd 100644
--- a/src/it/projects/MSITE-856/src/site/site.xml
+++ b/src/it/projects/MSITE-856/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0
http://maven.apache.org/xsd/decoration-1.6.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -33,4 +33,4 @@ under the License.
<item name="My first item"/>
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/MSITE-856/src/site/site_de.xml
b/src/it/projects/MSITE-856/src/site/site_de.xml
index 783290f0..13f8eec1 100644
--- a/src/it/projects/MSITE-856/src/site/site_de.xml
+++ b/src/it/projects/MSITE-856/src/site/site_de.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0
http://maven.apache.org/xsd/decoration-1.6.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -33,4 +33,4 @@ under the License.
<item name="Mein erstes Element"/>
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/doxia-formats/src/site/site.xml
b/src/it/projects/doxia-formats/src/site/site.xml
index da7fda3f..ebd558a2 100644
--- a/src/it/projects/doxia-formats/src/site/site.xml
+++ b/src/it/projects/doxia-formats/src/site/site.xml
@@ -19,10 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0
http://maven.apache.org/xsd/decoration-1.6.0.xsd";
- name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -43,4 +42,4 @@ under the License.
<item name="Doxia Formats IT" href="index.html" />
</breadcrumbs>
</body>
-</project>
+</site>
diff --git a/src/it/projects/doxia-formats/src/site/site_de.xml
b/src/it/projects/doxia-formats/src/site/site_de.xml
index fcc07e87..e8cfc2e8 100644
--- a/src/it/projects/doxia-formats/src/site/site_de.xml
+++ b/src/it/projects/doxia-formats/src/site/site_de.xml
@@ -19,10 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0
http://maven.apache.org/xsd/decoration-1.6.0.xsd";
- name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -43,4 +42,4 @@ under the License.
<item name="Doxia-Formate IT" href="index.html" />
</breadcrumbs>
</body>
-</project>
+</site>
diff --git a/src/it/projects/effective-site/src/site/site.xml
b/src/it/projects/effective-site/src/site/site.xml
index 2864e628..5a12f430 100644
--- a/src/it/projects/effective-site/src/site/site.xml
+++ b/src/it/projects/effective-site/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-680" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="MSITE-680">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -34,4 +34,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml
b/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml
index 12db5cb5..1f5afb88 100644
--- a/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml
+++ b/src/it/projects/inheritance-interpolation/repo-parent/src/site/site.xml
@@ -19,12 +19,10 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0
http://maven.apache.org/xsd/decoration-1.6.0.xsd";>
- <bannerLeft>
- <name>project.artifactId = ${project.artifactId}</name>
- </bannerLeft>
+<site 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";
+ name="${project.name}">
+ <bannerLeft name="project.artifactId = ${project.artifactId}" />
<skin>
<groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@ under the License.
<item name="${this.name}"
href="http://maven.apache.org/${this.artifactId}"; />
</breadcrumbs>
</body>
-</project>
+</site>
diff --git
a/src/it/projects/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
b/src/it/projects/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
index cde13821..1ffad429 100644
---
a/src/it/projects/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
+++
b/src/it/projects/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Grand Child As Ref Site">
+<site 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";
+ name="Grand Child As Ref Site">
<body>
@@ -32,4 +34,4 @@ under the License.
</body>
-</project>
+</site>
diff --git
a/src/it/projects/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
b/src/it/projects/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
index 8d91fff9..9d6c16d3 100644
--- a/src/it/projects/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
+++ b/src/it/projects/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Child As Ref Site">
+<site 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";
+ name="Child As Ref Site">
<body>
@@ -32,4 +34,4 @@ under the License.
</body>
-</project>
+</site>
diff --git a/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
b/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
index 2f6d87d9..e705d8a4 100644
--- a/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
+++ b/src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
@@ -18,8 +18,9 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<project name="Parent As Ref Site">
+<site 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";
+ name="Parent As Ref Site">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -49,4 +50,4 @@ under the License.
</body>
-</project>
+</site>
diff --git
a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
index fb1612fa..29b4547b 100644
---
a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
+++
b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Grand Child Not As Ref Site">
+<site 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";
+ name="Grand Child Not As Ref Site">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -37,4 +39,4 @@ under the License.
</body>
-</project>
+</site>
diff --git
a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
index d3ef8cc0..cba34964 100644
---
a/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
+++
b/src/it/projects/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
@@ -18,8 +18,9 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<project name="Child Not As Ref Site">
+<site 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";
+ name="Child Not As Ref Site">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -37,4 +38,4 @@ under the License.
</body>
-</project>
+</site>
diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml
b/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml
index b6ffe062..7e72915a 100644
--- a/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml
+++ b/src/it/projects/inheritedMenus/parentNotAsRef/src/site/site.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Parent Not As Ref Site">
+<site 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";
+ name="Project Not As Ref Site">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -49,4 +51,4 @@ under the License.
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-attach-descriptor/child/src/site/site.xml
b/src/it/projects/site-attach-descriptor/child/src/site/site.xml
index ffc055e3..ec9b2dfe 100644
--- a/src/it/projects/site-attach-descriptor/child/src/site/site.xml
+++ b/src/it/projects/site-attach-descriptor/child/src/site/site.xml
@@ -19,12 +19,12 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-597" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>${fluidoSkinVersion}</version>
</skin>
-</project>
+</site>
diff --git a/src/it/projects/site-attach-descriptor/src/site/site.xml
b/src/it/projects/site-attach-descriptor/src/site/site.xml
index 3db39072..9885790c 100644
--- a/src/it/projects/site-attach-descriptor/src/site/site.xml
+++ b/src/it/projects/site-attach-descriptor/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-attach-descriptor/src/site/site_sv.xml
b/src/it/projects/site-attach-descriptor/src/site/site_sv.xml
index 3d95df02..a76f6846 100644
--- a/src/it/projects/site-attach-descriptor/src/site/site_sv.xml
+++ b/src/it/projects/site-attach-descriptor/src/site/site_sv.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-deploy/src/site/site.xml
b/src/it/projects/site-deploy/src/site/site.xml
index 3db39072..9885790c 100644
--- a/src/it/projects/site-deploy/src/site/site.xml
+++ b/src/it/projects/site-deploy/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git
a/src/it/projects/site-inheritance/child_and_module/src/site/site.xml
b/src/it/projects/site-inheritance/child_and_module/src/site/site.xml
index bae7aae1..55aebeda 100644
--- a/src/it/projects/site-inheritance/child_and_module/src/site/site.xml
+++ b/src/it/projects/site-inheritance/child_and_module/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -47,4 +48,4 @@ under the License.
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml
b/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml
index bae7aae1..55aebeda 100644
--- a/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml
+++ b/src/it/projects/site-inheritance/inheriting_child/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -47,4 +48,4 @@ under the License.
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-inheritance/module/src/site/site.xml
b/src/it/projects/site-inheritance/module/src/site/site.xml
index 4da7d4ee..181146b5 100644
--- a/src/it/projects/site-inheritance/module/src/site/site.xml
+++ b/src/it/projects/site-inheritance/module/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -48,4 +49,4 @@ under the License.
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-inheritance/parent/src/site/site.xml
b/src/it/projects/site-inheritance/parent/src/site/site.xml
index c8259287..3db4d936 100644
--- a/src/it/projects/site-inheritance/parent/src/site/site.xml
+++ b/src/it/projects/site-inheritance/parent/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -47,4 +48,4 @@ under the License.
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-inheritance/sub_module/src/site/site.xml
b/src/it/projects/site-inheritance/sub_module/src/site/site.xml
index ef633014..2dd1812e 100644
--- a/src/it/projects/site-inheritance/sub_module/src/site/site.xml
+++ b/src/it/projects/site-inheritance/sub_module/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -47,4 +48,4 @@ under the License.
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-jar/src/site/site.xml
b/src/it/projects/site-jar/src/site/site.xml
index 3db39072..9885790c 100644
--- a/src/it/projects/site-jar/src/site/site.xml
+++ b/src/it/projects/site-jar/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-sd-lang/mymodule/src/site/site.xml
b/src/it/projects/site-sd-lang/mymodule/src/site/site.xml
index d72e7f3d..7d5bfcd9 100644
--- a/src/it/projects/site-sd-lang/mymodule/src/site/site.xml
+++ b/src/it/projects/site-sd-lang/mymodule/src/site/site.xml
@@ -19,21 +19,23 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>${fluidoSkinVersion}</version>
</skin>
- <version position="left" />
- <body>
- <menu name="${project.name}">
- <item name="Welcome mymodule" href="index.html" />
- <item name="Contacts" href="contact.html" />
- <item name="back to multi" href="../index.html" />
- </menu>
- <menu name="Java Doc">
- <item name="javadoc" href="apidocs/index.html" />
- </menu>
- </body>
-</project>
+ <version position="left" />
+ <body>
+ <menu name="${project.name}">
+ <item name="Welcome mymodule" href="index.html" />
+ <item name="Contacts" href="contact.html" />
+ <item name="back to multi" href="../index.html" />
+ </menu>
+ <menu name="Java Doc">
+ <item name="javadoc" href="apidocs/index.html" />
+ </menu>
+ </body>
+</site>
diff --git a/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml
b/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml
index 1f17396f..59fda3cb 100644
--- a/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml
+++ b/src/it/projects/site-sd-lang/mymodule/src/site/site_fr.xml
@@ -19,21 +19,23 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>${fluidoSkinVersion}</version>
</skin>
- <version position="left" />
- <body>
- <menu name="${project.name}">
- <item name="Accueil" href="index.html" />
- <item name="Contacts" href="contact.html" />
- <item name="Retour multi" href="../index.html" />
- </menu>
- <menu name="Java Doc">
- <item name="javadoc" href="apidocs/index.html" />
- </menu>
- </body>
-</project>
+ <version position="left" />
+ <body>
+ <menu name="${project.name}">
+ <item name="Accueil" href="index.html" />
+ <item name="Contacts" href="contact.html" />
+ <item name="Retour multi" href="../index.html" />
+ </menu>
+ <menu name="Java Doc">
+ <item name="javadoc" href="apidocs/index.html" />
+ </menu>
+ </body>
+</site>
diff --git a/src/it/projects/site-sd-lang/src/site/site.xml
b/src/it/projects/site-sd-lang/src/site/site.xml
index 8faa7f9c..3f640525 100644
--- a/src/it/projects/site-sd-lang/src/site/site.xml
+++ b/src/it/projects/site-sd-lang/src/site/site.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -41,4 +43,4 @@ under the License.
<menu ref="modules"/>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-sd-lang/src/site/site_de_AT.xml
b/src/it/projects/site-sd-lang/src/site/site_de_AT.xml
index f21304d0..5f0995f5 100644
--- a/src/it/projects/site-sd-lang/src/site/site_de_AT.xml
+++ b/src/it/projects/site-sd-lang/src/site/site_de_AT.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -36,4 +38,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-sd-lang/src/site/site_de_DE.xml
b/src/it/projects/site-sd-lang/src/site/site_de_DE.xml
index 8952db43..32c4bca2 100644
--- a/src/it/projects/site-sd-lang/src/site/site_de_DE.xml
+++ b/src/it/projects/site-sd-lang/src/site/site_de_DE.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -36,4 +38,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-sd-lang/src/site/site_fr.xml
b/src/it/projects/site-sd-lang/src/site/site_fr.xml
index 55dc932f..7b8cd9d7 100644
--- a/src/it/projects/site-sd-lang/src/site/site_fr.xml
+++ b/src/it/projects/site-sd-lang/src/site/site_fr.xml
@@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}">
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -42,4 +44,4 @@ under the License.
<menu ref="modules"/>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/site-sd/src/site/site.xml
b/src/it/projects/site-sd/src/site/site.xml
index 6f427168..f0dc85fd 100644
--- a/src/it/projects/site-sd/src/site/site.xml
+++ b/src/it/projects/site-sd/src/site/site.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -33,4 +33,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
-</project>
+</site>
diff --git a/src/it/projects/template-skin/src/site/site.xml
b/src/it/projects/template-skin/src/site/site.xml
index 98ca2e10..96e32b05 100644
--- a/src/it/projects/template-skin/src/site/site.xml
+++ b/src/it/projects/template-skin/src/site/site.xml
@@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<site 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";
+ name="${project.name}">
<skin>
<groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>template-skin</artifactId>
@@ -36,4 +37,4 @@ under the License.
<!--<item name="Xdoc Example" href="xdoc.html"/>-->
</menu>
</body>
-</project>
+</site>
diff --git a/src/it/projects/validate/src/site/site.xml
b/src/it/projects/validate/src/site/site.xml
index 14298caf..284ba007 100644
--- a/src/it/projects/validate/src/site/site.xml
+++ b/src/it/projects/validate/src/site/site.xml
@@ -19,15 +19,14 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
- <bannerLeft>
- <name>Maven</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site 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";
+ name="${project.name}">
+ <bannerLeft name="Maven" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
@@ -49,4 +48,4 @@ under the License.
<item name="Xdoc Example" href="xdoc.html"/>
</menu>
</body>
-</project>
+</site>
diff --git
a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
index 69ea40c0..c6038d7f 100644
---
a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
@@ -137,7 +137,7 @@ public class EffectiveSiteMojo extends
AbstractSiteDescriptorMojo {
}
effectiveSite = sWriter.toString();
- effectiveSite =
effectiveSite.substring(effectiveSite.indexOf("<project ")); // remove "<?xml"
header
+ effectiveSite = effectiveSite.substring(effectiveSite.indexOf("<site
")); // remove "<?xml" header
writeComment(writer, "Effective site descriptor for project \'" +
project.getId() + "\'");
![http://maven.apache.org/images/apache-maven-project.png"](http://maven.apache.org/images/apache-maven-project.png"){kind=link}
![http://maven.apache.org/images/maven-small.gif"](http://maven.apache.org/images/maven-small.gif"){kind=link}