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 @@ rest-showcase + + UTF-8 + + true + true + + @@ -78,14 +85,6 @@ WEB-INF/classes/LICENSE.txt,WEB-INF/classes/NOTICE.txt - - maven-site-plugin - - true - true - false - - ${project.artifactId} @@ -107,7 +106,4 @@ - - UTF-8 - 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 @@ pom Struts 2 Assembly + + UTF-8 + + true + true + + - - - maven-site-plugin - - true - true - false - - - org.codehaus.mojo dependency-maven-plugin @@ -249,8 +246,4 @@ - - - UTF-8 - 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 @@ 2.5.14-SNAPSHOT + true + true - - - - maven-site-plugin - - true - true - false - - - - - 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -48,11 +48,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -47,11 +47,10 @@
-
- Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts - project logos are trademarks of The Apache Software Foundation. -
+ + Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project + logos are trademarks of The Apache Software Foundation. + ]]>
- diff --git a/pom.xml b/pom.xml index 3a83b32cc..2eb242fce 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,8 @@ + UTF-8 + ${project.version} 4.1.6.RELEASE 3.1.15 @@ -90,12 +92,8 @@ 1.0.6 2.9.0 - - ${project.build.directory}/site - ${site.mainDirectory}/staging - ${site.mainDirectory}/scm - file://${siteContent.path} - UTF-8 + + 1.6 @@ -257,22 +255,18 @@ org.apache.maven.plugins maven-source-plugin - - org.apache.maven.plugins - maven-scm-publish-plugin - - ${scmCheckout.path} - ${siteContent.path} - - org.apache.maven.plugins maven-site-plugin - ${siteDeploy.url} false + + org.apache.maven.doxia + doxia-core + 1.7 + org.apache.maven.doxia doxia-module-markdown @@ -291,6 +285,9 @@ org.apache.maven.plugins maven-project-info-reports-plugin + + false + org.apache.maven.plugins 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. */ --> - + org.apache.maven.skins maven-fluido-skin - 1.3.1 + ${fluido-skin.version} Apache Software Foundation @@ -35,8 +35,8 @@ http://struts.apache.org/img/struts-logo.svg http://struts.apache.org/ - - + + @@ -48,13 +48,17 @@ - + + + + +