Author: buildbot
Date: Thu Aug 8 16:42:20 2013
New Revision: 873532
Log:
Staging update by buildbot for sis
Modified:
websites/staging/sis/trunk/content/ (props changed)
websites/staging/sis/trunk/content/release-management.html
Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Aug 8 16:42:20 2013
@@ -1 +1 @@
-1511623
+1511861
Modified: websites/staging/sis/trunk/content/release-management.html
==============================================================================
--- websites/staging/sis/trunk/content/release-management.html (original)
+++ websites/staging/sis/trunk/content/release-management.html Thu Aug 8
16:42:20 2013
@@ -206,10 +206,14 @@ but also in a few Java files. The follow
</pre></div>
-<p>Open the root <code>pom.xml</code> file in an editor and remove the
following sections:</p>
+<p>Open the root <code>pom.xml</code> file in an editor and perform the
following changes:</p>
<ul>
-<li>The whole <code><pluginRepositories></code> section, since it should
not be needed for releases (and is actually not allowed).</li>
-<li>The <code><plugin></code> section for
<code>docbkx-maven-plugin</code>, since the DocBook directory is omitted (see
below).</li>
+<li>Copy-and-paste the whole <code><plugin></code> section for
<code>maven-javadoc-plugin</code> from <code><reporting></code> to
<code><build></code>.
+ We need the javadoc configuration to be duplicated in both
<code><reporting></code> and <code><build></code> sections in order
+ to get the expected Javadoc output in both Maven site and in the
<code>*-javadoc.jar</code> files to deployed in the
+ Maven repository. <strong>TODO:</strong> see if upgrading Maven or the
<code>maven-javadoc-plugin</code> can solve this problem.</li>
+<li>Remove the whole <code><pluginRepositories></code> section, since it
should not be needed for releases (and is actually not allowed).</li>
+<li>Remove the <code><plugin></code> section for
<code>docbkx-maven-plugin</code>, since the DocBook directory is omitted (see
below).</li>
</ul>
<p>Recursively delete the <code>src/main/docbook</code> directory (this policy
may be revised in future SIS releases).
We omit this directory for now because this material may move to the CMS, and
no English version is available yet.</p>
@@ -251,13 +255,12 @@ However we perform those steps manually
<li>Perform some additional changes on the tag.</li>
<li>Reduce the amount of commits on SVN (avoid a rollback in branch
directory).</li>
<li>Give more opportunities to take action before commit in case of
problems.</li>
-<li>We need a separated <code>install</code> phase first, then a
<code>site</code> phase at deploy time
- (even if the site is not deployed) for proper execution of SIS custom
taglets.</li>
+<li>We need a separated <code>install</code> phase first, for proper
installation of <code>sis-build-helper</code> plugin.</li>
</ul>
-<p>First, create the branch:</p>
+<p>First, create the tag:</p>
<div class="codehilite"><pre>svn copy
https://svn.apache.org/repos/asf/sis/branches/<span
class="nv">$NEW_VERSION</span> <span class="se">\</span>
https://svn.apache.org/repos/asf/sis/tags/<span
class="nv">$NEW_VERSION</span> <span class="se">\</span>
- --message <span class="s2">"Create the $NEW_VERSION
tag."</span>
+ --message <span class="s2">"Create the $NEW_VERSION tag for
RC$RELEASE_CANDIDATE."</span>
</pre></div>
@@ -296,11 +299,9 @@ mvn clean
<h1 id="maven-deploy">Deploy Maven artifacts</h1>
<p>Ensure that the current directory is <code>tags/$NEW_VERSION</code>.
-Execute an <code>install</code> phase first (required for our custom
<code>sis-build-helper</code> plugin), then deploy.
-Note that the <code>site</code> phase need to be specified even if we will not
deploy the site,
-for proper execution of our custom Javadoc taglets.</p>
+Execute an <code>install</code> phase first (required for our custom
<code>sis-build-helper</code> plugin), then deploy.</p>
<div class="codehilite"><pre>mvn clean install
-mvn site deploy --activate-profiles apache-release --define <span
class="nv">skipTests</span><span class="o">=</span><span class="nb">true</span>
+mvn deploy --activate-profiles apache-release
</pre></div>
@@ -313,6 +314,15 @@ Navigate through the artifact tree and m
<li><a href="http://people.apache.org/~henkp/repo/faq.html";>Maven repository
PGP signature checker FAQ</a></li>
<li><a href="http://www.apache.org/dev/release-signing.html";>Release
signing</a> (cited in the <a href="release-management-setup.html">Release
setup</a> page)</li>
</ul>
+<p>Select any <code>*-javadoc.jar</code> file and click on the <cite>Archive
Browser</cite> tab on the right side.
+Select any <code>*.html</code> file which is known to use some of the custom
taglets defined in the <code>sis-build-helper</code> module.
+Click on that file and verify that the custom elements are rendered properly.
+In particular, all Java code snippets are missing if the
<code>@preformat</code> taglet had not be properly registered,
+so try to see at least one code snippet.</p>
+<p>Delete all
<code>org/apache/sis/parent/$NEW_VERSION/sis-$NEW_VERSION-source-release.zip.*</code>
files on the Nexus repository.
+They should not be there - source release will be deployed on an other
repository later.</p>
+<p>Delete all <code>org/apache/sis/**/$NEW_VERSION/site.xml.*</code> files.
+There is no apparent reason for deploying Maven web site descriptors.</p>
<p>Close the Nexus staging repository: click the checkboxes for the open
staging repositories
(<code>org.apache.sis-<id></code>) and press <em>Close</em> in the menu
bar.
In the description field, enter <code>SIS
$NEW_VERSION-$RELEASE_CANDIDATE</code>
@@ -322,7 +332,7 @@ This will not be done automatically sinc
Announce on the <code>dev@</code> mailing list the availability of this
temporary repository for testing purpose.</p>
<h1 id="stage">Stage the source, binary and javadoc artifacts</h1>
<p>Create the directory for the new version and release candidate within the
distribution directory.
-The <code>RC</code> number shall correspond to the current release attempt.</p>
+The <code>$RELEASE_CANDIDATE</code> number shall correspond to the current
release attempt.</p>
<div class="codehilite"><pre>mkdir ../../distribution/<span
class="nv">$NEW_VERSION</span>
</pre></div>
