From 7ada6c4c6bebd751fbbbcf279192144c08e16246 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 20 Oct 2017 09:04:40 +0200
Subject: [PATCH 1/3] Adds missing dependency and drops unused properties

---
 pom.xml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a83b32cc..2eb242fce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,8 @@
     </organization>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
         <currentVersion>${project.version}</currentVersion>
         <struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
         <ognl.version>3.1.15</ognl.version>
@@ -90,12 +92,8 @@
         <tiles-request.version>1.0.6</tiles-request.version>
         <log4j2.version>2.9.0</log4j2.version>
 
-        <!-- SCM Site Configuration -->
-        <site.mainDirectory>${project.build.directory}/site</site.mainDirectory>
-        <siteContent.path>${site.mainDirectory}/staging</siteContent.path>
-        <scmCheckout.path>${site.mainDirectory}/scm</scmCheckout.path>
-        <siteDeploy.url>file://${siteContent.path}</siteDeploy.url>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Site generation -->
+        <fluido-skin.version>1.6</fluido-skin.version>
     </properties>
 
     <profiles>
@@ -257,22 +255,18 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <configuration>
-                    <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
-                    <content>${siteContent.path}</content>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
                     <relativizeDecorationLinks>false</relativizeDecorationLinks>
                 </configuration>
                 <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-core</artifactId>
+                        <version>1.7</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.apache.maven.doxia</groupId>
                         <artifactId>doxia-module-markdown</artifactId>
@@ -291,6 +285,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 726a0391e43b890587181a2a9ca95fdc4ac0f02d Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 20 Oct 2017 09:05:01 +0200
Subject: [PATCH 2/3] Simplifies sipping modules

---
 apps/pom.xml     | 18 +++++++-----------
 assembly/pom.xml | 21 +++++++--------------
 bom/pom.xml      | 15 ++-------------
 3 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/apps/pom.xml b/apps/pom.xml
index 3c3c11e84..ffc4b1f05 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -36,6 +36,13 @@
         <module>rest-showcase</module>
     </modules>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <maven.site.skip>true</maven.site.skip>
+        <maven.site.deploy.skip>true</maven.site.deploy.skip>
+    </properties>
+
     <build>
         <plugins>
             <!-- Include source code under WEB-INF/src/java -->
@@ -78,14 +85,6 @@
                     <warSourceExcludes>WEB-INF/classes/LICENSE.txt,WEB-INF/classes/NOTICE.txt</warSourceExcludes>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipDeploy>true</skipDeploy>
-                    <generateReports>false</generateReports>
-                </configuration>
-            </plugin>
         </plugins>
 
         <finalName>${project.artifactId}</finalName>
@@ -107,7 +106,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3df176779..0e7d34246 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -10,18 +10,15 @@
     <packaging>pom</packaging>
     <name>Struts 2 Assembly</name>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <maven.site.skip>true</maven.site.skip>
+        <maven.site.deploy.skip>true</maven.site.deploy.skip>
+    </properties>
+
     <build>
         <plugins>
-
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipDeploy>true</skipDeploy>
-                    <generateReports>false</generateReports>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>dependency-maven-plugin</artifactId>
@@ -249,8 +246,4 @@
         </dependency>
 
     </dependencies>
-
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>
diff --git a/bom/pom.xml b/bom/pom.xml
index b01a9f727..482fb1985 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -26,21 +26,10 @@
 
     <properties>
         <struts-version.version>2.5.14-SNAPSHOT</struts-version.version>
+        <maven.site.skip>true</maven.site.skip>
+        <maven.site.deploy.skip>true</maven.site.deploy.skip>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipDeploy>true</skipDeploy>
-                    <generateReports>false</generateReports>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencyManagement>
         <dependencies>
             <dependency>

From cb389d292d04922576a453e0d66502ca73db2b63 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 20 Oct 2017 09:05:29 +0200
Subject: [PATCH 3/3] Fixes Maven site generation

---
 core/src/site/site.xml                   | 15 +++++++--------
 plugins/cdi/src/site/site.xml            | 15 +++++++--------
 plugins/config-browser/src/site/site.xml | 15 +++++++--------
 plugins/convention/src/site/site.xml     | 15 +++++++--------
 plugins/dwr/src/site/site.xml            | 15 +++++++--------
 plugins/embeddedjsp/src/site/site.xml    | 15 +++++++--------
 plugins/gxp/src/site/site.xml            | 15 +++++++--------
 plugins/jasperreports/src/site/site.xml  | 15 +++++++--------
 plugins/javatemplates/src/site/site.xml  | 15 +++++++--------
 plugins/jfreechart/src/site/site.xml     | 15 +++++++--------
 plugins/json/src/site/site.xml           | 15 +++++++--------
 plugins/junit/src/site/site.xml          | 15 +++++++--------
 plugins/osgi/src/site/site.xml           | 15 +++++++--------
 plugins/oval/src/site/site.xml           | 15 +++++++--------
 plugins/pell-multipart/src/site/site.xml | 15 +++++++--------
 plugins/plexus/src/site/site.xml         | 15 +++++++--------
 plugins/portlet-tiles/src/site/site.xml  | 15 +++++++--------
 plugins/portlet/src/site/site.xml        | 15 +++++++--------
 plugins/rest/src/site/site.xml           | 15 +++++++--------
 plugins/sitegraph/src/site/site.xml      | 15 +++++++--------
 plugins/sitemesh/src/site/site.xml       | 15 +++++++--------
 plugins/spring/src/site/site.xml         | 15 +++++++--------
 plugins/src/site/site.xml                | 15 +++++++--------
 plugins/testng/src/site/site.xml         | 15 +++++++--------
 plugins/tiles/src/site/site.xml          | 15 +++++++--------
 src/site/site.xml                        | 22 +++++++++++++---------
 26 files changed, 188 insertions(+), 209 deletions(-)

diff --git a/core/src/site/site.xml b/core/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/core/src/site/site.xml
+++ b/core/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/cdi/src/site/site.xml b/plugins/cdi/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/cdi/src/site/site.xml
+++ b/plugins/cdi/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/config-browser/src/site/site.xml b/plugins/config-browser/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/config-browser/src/site/site.xml
+++ b/plugins/config-browser/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/convention/src/site/site.xml b/plugins/convention/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/convention/src/site/site.xml
+++ b/plugins/convention/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/dwr/src/site/site.xml b/plugins/dwr/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/dwr/src/site/site.xml
+++ b/plugins/dwr/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/embeddedjsp/src/site/site.xml b/plugins/embeddedjsp/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/embeddedjsp/src/site/site.xml
+++ b/plugins/embeddedjsp/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/gxp/src/site/site.xml b/plugins/gxp/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/gxp/src/site/site.xml
+++ b/plugins/gxp/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/jasperreports/src/site/site.xml b/plugins/jasperreports/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/jasperreports/src/site/site.xml
+++ b/plugins/jasperreports/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/javatemplates/src/site/site.xml b/plugins/javatemplates/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/javatemplates/src/site/site.xml
+++ b/plugins/javatemplates/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/jfreechart/src/site/site.xml b/plugins/jfreechart/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/jfreechart/src/site/site.xml
+++ b/plugins/jfreechart/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/json/src/site/site.xml b/plugins/json/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/json/src/site/site.xml
+++ b/plugins/json/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/junit/src/site/site.xml b/plugins/junit/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/junit/src/site/site.xml
+++ b/plugins/junit/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/osgi/src/site/site.xml b/plugins/osgi/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/osgi/src/site/site.xml
+++ b/plugins/osgi/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/oval/src/site/site.xml b/plugins/oval/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/oval/src/site/site.xml
+++ b/plugins/oval/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/pell-multipart/src/site/site.xml b/plugins/pell-multipart/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/pell-multipart/src/site/site.xml
+++ b/plugins/pell-multipart/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/plexus/src/site/site.xml b/plugins/plexus/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/plexus/src/site/site.xml
+++ b/plugins/plexus/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/portlet-tiles/src/site/site.xml b/plugins/portlet-tiles/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/portlet-tiles/src/site/site.xml
+++ b/plugins/portlet-tiles/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/portlet/src/site/site.xml b/plugins/portlet/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/portlet/src/site/site.xml
+++ b/plugins/portlet/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/rest/src/site/site.xml b/plugins/rest/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/rest/src/site/site.xml
+++ b/plugins/rest/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/sitegraph/src/site/site.xml b/plugins/sitegraph/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/sitegraph/src/site/site.xml
+++ b/plugins/sitegraph/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/sitemesh/src/site/site.xml b/plugins/sitemesh/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/sitemesh/src/site/site.xml
+++ b/plugins/sitemesh/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/spring/src/site/site.xml b/plugins/spring/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/spring/src/site/site.xml
+++ b/plugins/spring/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/src/site/site.xml b/plugins/src/site/site.xml
index e03d26d5c..4065327fd 100644
--- a/plugins/src/site/site.xml
+++ b/plugins/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -48,11 +48,10 @@
         <menu ref="modules"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/testng/src/site/site.xml b/plugins/testng/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/testng/src/site/site.xml
+++ b/plugins/testng/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/plugins/tiles/src/site/site.xml b/plugins/tiles/src/site/site.xml
index 07a667ec7..3c5109b0c 100644
--- a/plugins/tiles/src/site/site.xml
+++ b/plugins/tiles/src/site/site.xml
@@ -23,7 +23,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -47,11 +47,10 @@
         <menu ref="reports"/>
 
         <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
-
     </body>
 </project>
diff --git a/src/site/site.xml b/src/site/site.xml
index 07aaf7588..b27ae54bf 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,11 +19,11 @@
  * under the License.
  */
 -->
-<project name="Struts 2">
+<project name="Apache Struts">
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
+        <version>${fluido-skin.version}</version>
     </skin>
     <bannerLeft>
         <name>Apache Software Foundation</name>
@@ -35,8 +35,8 @@
         <src>http://struts.apache.org/img/struts-logo.svg</src>
         <href>http://struts.apache.org/</href>
     </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
+    <publishDate position="left"/>
+    <version position="right"/>
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org/"/>
@@ -48,13 +48,17 @@
         </menu>
 
         <menu ref="reports"/>
-        <menu ref="modules"/>
+        <menu name="Modules">
+            <item name="Struts 2 Core" href="struts2-core/index.html"/>
+            <item name="Struts Plugins" href="struts2-plugins/index.html"/>
+            <item name="Struts OSGi Bundles" href="struts2-osgi-bundles/index.html"/>
+        </menu>
 
         <footer>
-           <div class="row span12">
-               Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-               project logos are trademarks of The Apache Software Foundation.
-           </div>
+            <![CDATA[<div class="row span12">
+            Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project
+            logos are trademarks of The Apache Software Foundation.
+            </div>]]>
         </footer>
 
     </body>