You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/09 20:21:03 UTC
svn commit: r983761 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/it/MSITE-265/src/site/ src/it/MSITE-304/src/site/
src/it/site-attach-descriptor/src/site/ src/it/site-deploy/src/site/
src/it/site-inheritance/ src/it/site-inheritance/src/ ...
Author: dennisl
Date: Mon Aug 9 18:21:03 2010
New Revision: 983761
URL: http://svn.apache.org/viewvc?rev=983761&view=rev
Log:
Merge r884137 from trunk.
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/
- copied from r884137, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/src/
- copied from r884137, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/src/site/
- copied from r884137, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/src/site/site.xml
- copied unchanged from r884137, maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/src/site/site.xml
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 18:21:03 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,886844,886847,890094,890124,920027,942622,943455,944145,956681
+/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,920027,942622,943455,944145,956681
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml?rev=983761&r1=983760&r2=983761&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml Mon Aug 9 18:21:03 2010
@@ -20,7 +20,9 @@ under the License.
-->
<!--$Id$-->
-<project name="MSITE-265">
+<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -30,13 +32,13 @@ under the License.
<body>
<breadcrumbs>
<item name="Maven" href="http://maven.apache.org/${currentVersion}"/>
- </breadcrumbs>
+ </breadcrumbs>
<menu name="Releases TODO">
<item name="release1.6" href="releases/release1.6.html"/>
<item name="release1.6.3" href="releases/release1.6.3.html"/>
</menu>
<menu ref="parent"/>
<menu ref="reports"/>
- <menu ref="modules"/>
+ <menu ref="modules"/>
</body>
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/src/site/site.xml?rev=983761&r1=983760&r2=983761&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/src/site/site.xml Mon Aug 9 18:21:03 2010
@@ -19,7 +19,9 @@ specific language governing permissions
under the License.
-->
-<project>
+<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">
<body>
<menu ref="parent"/>
<menu ref="reports"/>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml?rev=983761&r1=983760&r2=983761&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml Mon Aug 9 18:21:03 2010
@@ -20,7 +20,9 @@ under the License.
-->
<!--$Id$-->
-<project name="MSITE-265">
+<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -30,13 +32,13 @@ under the License.
<body>
<breadcrumbs>
<item name="Maven" href="http://maven.apache.org/${currentVersion}"/>
- </breadcrumbs>
+ </breadcrumbs>
<menu name="Releases TODO">
<item name="release1.6" href="releases/release1.6.html"/>
<item name="release1.6.3" href="releases/release1.6.3.html"/>
</menu>
<menu ref="parent"/>
<menu ref="reports"/>
- <menu ref="modules"/>
+ <menu ref="modules"/>
</body>
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml?rev=983761&r1=983760&r2=983761&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml Mon Aug 9 18:21:03 2010
@@ -20,7 +20,9 @@ under the License.
-->
<!--$Id$-->
-<project name="MSITE-265">
+<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -30,13 +32,13 @@ under the License.
<body>
<breadcrumbs>
<item name="Maven" href="http://maven.apache.org/${currentVersion}"/>
- </breadcrumbs>
+ </breadcrumbs>
<menu name="Releases TODO">
<item name="release1.6" href="releases/release1.6.html"/>
<item name="release1.6.3" href="releases/release1.6.3.html"/>
</menu>
<menu ref="parent"/>
<menu ref="reports"/>
- <menu ref="modules"/>
+ <menu ref="modules"/>
</body>
</project>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml?rev=983761&r1=983760&r2=983761&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml Mon Aug 9 18:21:03 2010
@@ -20,7 +20,9 @@ under the License.
-->
<!--$Id$-->
-<project name="MSITE-265">
+<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
@@ -30,13 +32,13 @@ under the License.
<body>
<breadcrumbs>
<item name="Maven" href="http://maven.apache.org/${currentVersion}"/>
- </breadcrumbs>
+ </breadcrumbs>
<menu name="Releases TODO">
<item name="release1.6" href="releases/release1.6.html"/>
<item name="release1.6.3" href="releases/release1.6.3.html"/>
</menu>
<menu ref="parent"/>
<menu ref="reports"/>
- <menu ref="modules"/>
+ <menu ref="modules"/>
</body>
</project>