You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/09/10 11:07:39 UTC

(maven-archetypes) 01/01: Generate Doxia 2 sites from the site archetypes

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch agent/site-descriptor-v2
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git

commit d97a8c970e03b75f5d35afe7ae0187e0c0260606
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Sep 10 13:07:28 2026 +0200

    Generate Doxia 2 sites from the site archetypes
    
    The generated projects already pin Maven Site Plugin 3.22.0, so what they were
    handed did not match it: a v1 site descriptor, Fluido Skin 1.7, and a locale
    list without the root locale, which silently produced no index.html at the site
    root. Do not put 'en' back into <locales>: with Doxia 2 the default locale is
    the root one, and naming 'en' instead moves the whole English site into en/ and
    leaves the root empty.
---
 maven-archetype-archetype/src/site/site.xml         |  6 +++---
 maven-archetype-j2ee-simple/src/site/site.xml       |  6 +++---
 .../resources/archetype-resources/src/site/site.xml | 19 ++++++++-----------
 maven-archetype-plugin-site/src/site/site.xml       |  6 +++---
 maven-archetype-plugin/src/site/site.xml            |  6 +++---
 maven-archetype-portlet/src/site/site.xml           |  6 +++---
 maven-archetype-profiles/src/site/site.xml          |  6 +++---
 maven-archetype-quickstart/src/site/site.xml        |  6 +++---
 .../resources/archetype-resources/src/site/site.xml | 19 ++++++++-----------
 maven-archetype-simple/src/site/site.xml            |  6 +++---
 .../resources/archetype-resources/src/site/site.xml | 19 ++++++++-----------
 maven-archetype-site-simple/src/site/site.xml       |  6 +++---
 .../projects/it-basic/reference/src/site/site.xml   | 19 ++++++++-----------
 .../src/it/sample/src/site/site.xml                 |  6 +++---
 maven-archetype-site-skin/src/site/site.xml         |  6 +++---
 .../resources-filtered/archetype-resources/pom.xml  |  2 +-
 .../resources/archetype-resources/src/site/site.xml | 21 +++++++++------------
 .../archetype-resources/src/site/site_fr.xml        | 21 +++++++++------------
 maven-archetype-site/src/site/site.xml              |  6 +++---
 .../test/resources/projects/it-basic/verify.groovy  |  4 ++--
 maven-archetype-webapp/src/site/site.xml            |  6 +++---
 src/site/site.xml                                   |  6 +++---
 22 files changed, 95 insertions(+), 113 deletions(-)

diff --git a/maven-archetype-archetype/src/site/site.xml b/maven-archetype-archetype/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-archetype/src/site/site.xml
+++ b/maven-archetype-archetype/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-j2ee-simple/src/site/site.xml b/maven-archetype-j2ee-simple/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-j2ee-simple/src/site/site.xml
+++ b/maven-archetype-j2ee-simple/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml b/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml
index 556b296..a2f1199 100644
--- a/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml
+++ b/maven-archetype-plugin-site/src/main/resources/archetype-resources/src/site/site.xml
@@ -18,23 +18,20 @@
  */
 -->
 
-<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
-  <bannerLeft>
-    <name>${artifactId}</name>
-    <src>https://maven.apache.org/images/apache-maven-project.png</src>
-    <href>https://www.apache.org/</href>
+<site name="${artifactId}" xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
+  <bannerLeft href="https://www.apache.org/">
+    <image src="https://maven.apache.org/images/apache-maven-project.png" alt="${artifactId}"/>
   </bannerLeft>
 
-  <bannerRight>
-    <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
-    <href>https://maven.apache.org/</href>
+  <bannerRight href="https://maven.apache.org/">
+    <image src="https://maven.apache.org/images/maven-logo-black-on-white.png"/>
   </bannerRight>
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.7</version>
+    <version>2.1.0</version>
   </skin>
 
   <body>
@@ -58,4 +55,4 @@
 
     <menu ref="reports" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-plugin-site/src/site/site.xml b/maven-archetype-plugin-site/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-plugin-site/src/site/site.xml
+++ b/maven-archetype-plugin-site/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-plugin/src/site/site.xml b/maven-archetype-plugin/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-plugin/src/site/site.xml
+++ b/maven-archetype-plugin/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-portlet/src/site/site.xml b/maven-archetype-portlet/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-portlet/src/site/site.xml
+++ b/maven-archetype-portlet/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-profiles/src/site/site.xml b/maven-archetype-profiles/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-profiles/src/site/site.xml
+++ b/maven-archetype-profiles/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-quickstart/src/site/site.xml b/maven-archetype-quickstart/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-quickstart/src/site/site.xml
+++ b/maven-archetype-quickstart/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml b/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
index 42ed945..c4b9896 100644
--- a/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
+++ b/maven-archetype-simple/src/main/resources/archetype-resources/src/site/site.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
-  <bannerLeft>
-    <name>${artifactId}</name>
-    <src>https://maven.apache.org/images/apache-maven-project.png</src>
-    <href>https://www.apache.org/</href>
+<site name="${artifactId}" xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
+  <bannerLeft href="https://www.apache.org/">
+    <image src="https://maven.apache.org/images/apache-maven-project.png" alt="${artifactId}"/>
   </bannerLeft>
 
-  <bannerRight>
-    <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
-    <href>https://maven.apache.org/</href>
+  <bannerRight href="https://maven.apache.org/">
+    <image src="https://maven.apache.org/images/maven-logo-black-on-white.png"/>
   </bannerRight>
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.7</version>
+    <version>2.1.0</version>
   </skin>
 
   <body>
     <menu ref="parent" />
     <menu ref="reports" />
   </body>
-</project>
\ No newline at end of file
+</site>
\ No newline at end of file
diff --git a/maven-archetype-simple/src/site/site.xml b/maven-archetype-simple/src/site/site.xml
index 97d75fe..a257fb9 100644
--- a/maven-archetype-simple/src/site/site.xml
+++ b/maven-archetype-simple/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.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <body>
     <menu ref="parent" />
   </body>
-</project>
\ No newline at end of file
+</site>
\ No newline at end of file
diff --git a/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml b/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml
index 3ecfa47..ebfaa94 100644
--- a/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml
+++ b/maven-archetype-site-simple/src/main/resources/archetype-resources/src/site/site.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
-  <bannerLeft>
-    <name>${artifactId}</name>
-    <src>https://maven.apache.org/images/apache-maven-project.png</src>
-    <href>https://www.apache.org/</href>
+<site name="${artifactId}" xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
+  <bannerLeft href="https://www.apache.org/">
+    <image src="https://maven.apache.org/images/apache-maven-project.png" alt="${artifactId}"/>
   </bannerLeft>
 
-  <bannerRight>
-    <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
-    <href>https://maven.apache.org/</href>
+  <bannerRight href="https://maven.apache.org/">
+    <image src="https://maven.apache.org/images/maven-logo-black-on-white.png"/>
   </bannerRight>
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.7</version>
+    <version>2.1.0</version>
   </skin>
 
   <body>
@@ -30,4 +27,4 @@
 
     <menu ref="reports" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-site-simple/src/site/site.xml b/maven-archetype-site-simple/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-site-simple/src/site/site.xml
+++ b/maven-archetype-site-simple/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml
index 3ecfa47..ebfaa94 100644
--- a/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml
+++ b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<project name="${artifactId}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
-  <bannerLeft>
-    <name>${artifactId}</name>
-    <src>https://maven.apache.org/images/apache-maven-project.png</src>
-    <href>https://www.apache.org/</href>
+<site name="${artifactId}" xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
+  <bannerLeft href="https://www.apache.org/">
+    <image src="https://maven.apache.org/images/apache-maven-project.png" alt="${artifactId}"/>
   </bannerLeft>
 
-  <bannerRight>
-    <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
-    <href>https://maven.apache.org/</href>
+  <bannerRight href="https://maven.apache.org/">
+    <image src="https://maven.apache.org/images/maven-logo-black-on-white.png"/>
   </bannerRight>
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.7</version>
+    <version>2.1.0</version>
   </skin>
 
   <body>
@@ -30,4 +27,4 @@
 
     <menu ref="reports" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml b/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml
index d0d5f9c..5de9a34 100644
--- a/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml
+++ b/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd"
   name="${skinName}">
 
   <skin>
@@ -27,4 +27,4 @@
 
   </body>
 
-</project>
\ No newline at end of file
+</site>
\ No newline at end of file
diff --git a/maven-archetype-site-skin/src/site/site.xml b/maven-archetype-site-skin/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-site-skin/src/site/site.xml
+++ b/maven-archetype-site-skin/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
index 18a26c2..7fe7795 100644
--- a/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-site/src/main/resources-filtered/archetype-resources/pom.xml
@@ -46,7 +46,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
-          <locales>en,fr</locales>
+          <locales>default,fr</locales>
         </configuration>
       </plugin>
     </plugins>
diff --git a/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml b/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml
index 1cc2973..e208d52 100644
--- a/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml
+++ b/maven-archetype-site/src/main/resources/archetype-resources/src/site/site.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="${artifactId}"
-  xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
-  <bannerLeft>
-    <name>${artifactId}</name>
-    <src>https://maven.apache.org/images/apache-maven-project.png</src>
-    <href>https://www.apache.org/</href>
+<site name="${artifactId}"
+  xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
+  <bannerLeft href="https://www.apache.org/">
+    <image src="https://maven.apache.org/images/apache-maven-project.png" alt="${artifactId}"/>
   </bannerLeft>
 
-  <bannerRight>
-    <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
-    <href>https://maven.apache.org/</href>
+  <bannerRight href="https://maven.apache.org/">
+    <image src="https://maven.apache.org/images/maven-logo-black-on-white.png"/>
   </bannerRight>
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.7</version>
+    <version>2.1.0</version>
   </skin>
 
   <body>
@@ -36,4 +33,4 @@
 
     <menu ref="reports" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml b/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml
index 17035ef..9d2aa81 100644
--- a/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml
+++ b/maven-archetype-site/src/main/resources/archetype-resources/src/site/site_fr.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="${artifactId}"
-  xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
-  <bannerLeft>
-    <name>${artifactId}</name>
-    <src>https://maven.apache.org/images/apache-maven-project.png</src>
-    <href>https://www.apache.org/</href>
+<site name="${artifactId}"
+  xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
+  <bannerLeft href="https://www.apache.org/">
+    <image src="https://maven.apache.org/images/apache-maven-project.png" alt="${artifactId}"/>
   </bannerLeft>
 
-  <bannerRight>
-    <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
-    <href>https://maven.apache.org/</href>
+  <bannerRight href="https://maven.apache.org/">
+    <image src="https://maven.apache.org/images/maven-logo-black-on-white.png"/>
   </bannerRight>
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.7</version>
+    <version>2.1.0</version>
   </skin>
 
   <body>
@@ -36,4 +33,4 @@
 
     <menu ref="reports" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-site/src/site/site.xml b/maven-archetype-site/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-site/src/site/site.xml
+++ b/maven-archetype-site/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/maven-archetype-site/src/test/resources/projects/it-basic/verify.groovy b/maven-archetype-site/src/test/resources/projects/it-basic/verify.groovy
index 8222293..f7b7e6b 100644
--- a/maven-archetype-site/src/test/resources/projects/it-basic/verify.groovy
+++ b/maven-archetype-site/src/test/resources/projects/it-basic/verify.groovy
@@ -1,4 +1,4 @@
-assert new File(context.projectDir, 'target/site/en').exists();
+// the default locale renders at the root of the site, the additional one below it
+assert new File(context.projectDir, 'target/site/index.html').isFile();
 assert new File(context.projectDir, 'target/site/fr').isDirectory();
-assert new File(context.projectDir, 'target/site/en/index.html').exists();
 assert new File(context.projectDir, 'target/site/fr/index.html').isFile();
\ No newline at end of file
diff --git a/maven-archetype-webapp/src/site/site.xml b/maven-archetype-webapp/src/site/site.xml
index 786307d..771c77a 100644
--- a/maven-archetype-webapp/src/site/site.xml
+++ b/maven-archetype-webapp/src/site/site.xml
@@ -19,10 +19,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
   <edit>${project.scm.url}</edit>
   <body>
     <menu ref="parent" />
   </body>
-</project>
+</site>
diff --git a/src/site/site.xml b/src/site/site.xml
index 587dedf..6cf000a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,8 +19,8 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site xmlns="http://maven.apache.org/SITE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.1.0 https://maven.apache.org/xsd/site-2.1.0.xsd">
 
   <edit>${project.scm.url}</edit>
 
@@ -38,4 +38,4 @@ under the License.
 
     <menu ref="modules" />
   </body>
-</project>
\ No newline at end of file
+</site>
\ No newline at end of file