svn commit: r889572 - in /websites/staging/maven/trunk/content: ./ developers/release/parent-pom-release.html maven-site-1.0-site.jar

[bu...@apache.org]

Author: buildbot
Date: Sun Dec  8 16:31:09 2013
New Revision: 889572

Log:
Staging update by buildbot for maven

Modified:
    websites/staging/maven/trunk/content/   (props changed)
    websites/staging/maven/trunk/content/developers/release/parent-pom-release.html
    websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Dec  8 16:31:09 2013
@@ -1 +1 @@
-1549055
+1549057

Modified: websites/staging/maven/trunk/content/developers/release/parent-pom-release.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/release/parent-pom-release.html (original)
+++ websites/staging/maven/trunk/content/developers/release/parent-pom-release.html Sun Dec  8 16:31:09 2013
@@ -247,7 +247,7 @@ Dennis Lundberg" />
 <p>Note that Parent POMs have particular conventions for managing and deploying the documentation.</p>
 <div class="section">
 <h3>Rationale<a name="Rationale"></a></h3>
-<p>To be able to publish a documentation for the parent POM without affecting released POM and <tt>site.xml</tt>, parent POM projects have a specific structure, with the addition of <tt>site-pom.xml</tt> and <tt>src/site-docs</tt> provide <tt>mvn -f site-pom.xml site</tt>:</p>
+<p>To be able to publish a documentation for the parent POM without affecting released <tt>pom.xml</tt> and <tt>site.xml</tt>, parent POM projects have a specific structure, with the addition of <tt>site-pom.xml</tt> and <tt>src/site-docs</tt> to provide <tt>mvn -f site-pom.xml site</tt> with useful documentation content:</p>
 <div class="source">
 <pre>|-- pom.xml
 |-- site-pom.xml
@@ -265,11 +265,9 @@ Dennis Lundberg" />
 <p>Before staging the release with usual procedure, you need to update <tt>site-pom.xml</tt> and <tt>index.apt</tt> to take the future release into account:</p>
 <ol style="list-style-type: decimal">
 <li>update <tt>site-pom.xml</tt> parent POM version to match the version being released,</li>
-<li>update <tt>src/site-docs/index.apt</tt>: add a line in the history of <tt>pom.xml</tt> for the future version, referring to the future svn release tag and date. Hint: in the diff link, the value for the <tt>r2</tt> parameter is easily found by following the previous version's link and copying revision number.</li></ol>
-<p>Once these modifications are done, you can follow standard staging steps taking care to use the <tt>site-pom.xml</tt> POM, with <tt>mvn -f site-pom.xml ...</tt> command, each time the parent POM's site is generated.</p></div>
-<div class="section">
-<h3>Staging the latest documentation<a name="Staging_the_latest_documentation"></a></h3>
-<p>Instructions for staging latest documentation are the same as <a href="../website/deploy-component-reference-documentation.html">standard component</a>, with the addition of <tt>-f site-pom.xml</tt>.</p>
+<li>update <tt>src/site-docs/index.apt</tt>: add a line in the history of <tt>pom.xml</tt> for the version being released, referring to the future svn release tag and date.
+<p><b>Hint</b>: in the diff link, the value for the <tt>r2</tt> parameter is easily found by following the previous version's link and copying its revision number.</p></li></ol>
+<p>Once these modifications are done, you can follow <a href="../website/deploy-component-reference-documentation.html">standard component documentation staging steps</a>, taking care to use the <tt>site-pom.xml</tt> POM, with <tt>mvn -f site-pom.xml ...</tt> command, each time the parent POM's site is generated or published.</p>
 <p>Then the only difference is with commands to stage the site:</p>
 <div class="source">
 <pre>cd target/checkout
@@ -277,7 +275,7 @@ mvn -f site-pom.xml site
 mvn -f site-pom.xml scm-publish:publish-scm</pre></div></div>
 <div class="section">
 <h3>Call the vote<a name="Call_the_vote"></a></h3>
-<p>In the vote, instead of providing links to JIRA, the parent POMs should include a link to the SVN changes since the last release:</p>
+<p>In the vote, instead of providing links to JIRA, the parent POMs should include a link to the SVN changes since the last release (the link previously added to <tt>src/site-docs/index.apt</tt>):</p>
 <div class="source">
 <pre>...
 Hi,

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.