sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1050252 - in /websites/staging/sis/trunk/content: ./ release-management-setup.html release-management.html
Date Wed, 18 Sep 2019 15:53:03 GMT
Author: buildbot
Date: Wed Sep 18 15:53:03 2019
New Revision: 1050252

Log:
Staging update by buildbot for sis

Modified:
    websites/staging/sis/trunk/content/   (props changed)
    websites/staging/sis/trunk/content/release-management-setup.html
    websites/staging/sis/trunk/content/release-management.html

Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Sep 18 15:53:03 2019
@@ -1 +1 @@
-1867020
+1867137

Modified: websites/staging/sis/trunk/content/release-management-setup.html
==============================================================================
--- websites/staging/sis/trunk/content/release-management-setup.html (original)
+++ websites/staging/sis/trunk/content/release-management-setup.html Wed Sep 18 15:53:03 2019
@@ -104,7 +104,6 @@ If those steps have already been done, j
 <div class="toc">
 <ul>
 <li><a href="#directory-layout">Directory layout</a></li>
-<li><a href="#shell">Shell configuration</a></li>
 <li><a href="#generate-key">Generate GPG key</a><ul>
 <li><a href="#trust">Web of trust</a></li>
 </ul>
@@ -137,13 +136,6 @@ svn checkout https://dist.apache.org/rep
 </pre></div>
 
 
-<h1 id="shell">Shell configuration<a class="headerlink" href="#shell" title="Permanent
link">&para;</a></h1>
-<p>It is better for Unix shells to contain the following line in their initialization
file
-(typically <code>~/.bashrc</code> or <code>~/.profile</code>, where
<code>~</code> stands for the user's home directory):</p>
-<div class="codehilite"><pre><span class="nb">export </span><span
class="nv">GPG_TTY</span><span class="o">=</span><span class="k">$(</span>tty<span
class="k">)</span>
-</pre></div>
-
-
 <h1 id="generate-key">Generate GPG key<a class="headerlink" href="#generate-key"
title="Permanent link">&para;</a></h1>
 <p>The releases have to be signed by public key cryptography signatures.
 Detailed instructions about why releases have to be signed are provided on the <a href="http://www.apache.org/dev/release-signing.html">Release
Signing</a> page.

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 Wed Sep 18 15:53:03 2019
@@ -100,7 +100,7 @@
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
> .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink
{ visibility: visible }</style>
 <p>This page describes how to create and deploy the SIS Maven artifacts, binary bundle,
javadoc and list of API changes.
 The <a href="http://www.apache.org/dev/release.html">Release FAQ</a> page describes
the foundation wide policies.
-The instructions on this page provide a summary suitable to SIS releases, together with SIS-specific
steps.
+Instructions on this page describe the steps specific to SIS (we do not use the <code>mvn
release</code> command).
 The intended audiences are SIS release managers.</p>
 <div class="toc">
 <ul>
@@ -110,18 +110,16 @@ The intended audiences are SIS release m
 </li>
 <li><a href="#prepare-source">Review project status before branching</a><ul>
 <li><a href="#release-notes">Prepare release notes</a></li>
-<li><a href="#test-master">Test master extensively</a></li>
-<li><a href="#prepare-code">Source code</a></li>
 </ul>
 </li>
-<li><a href="#branch">Create branch and tag</a><ul>
-<li><a href="#tag">Tag the branch</a></li>
-<li><a href="#branch-verify">Verify content</a></li>
+<li><a href="#branch">Create release branch</a><ul>
+<li><a href="#test-branch">Test branch extensively</a></li>
+<li><a href="#maven-nonfree">Prepare non-free resources</a></li>
+<li><a href="#integration-tests">Integration test</a></li>
 </ul>
 </li>
 <li><a href="#maven-deploy">Deploy Maven artifacts</a><ul>
 <li><a href="#nexus-close">Verify and close the Nexus release artifacts</a></li>
-<li><a href="#maven-nonfree">Deploy non-free resources to Nexus</a></li>
 <li><a href="#nexus-text">Test the Nexus release artifacts</a></li>
 </ul>
 </li>
@@ -169,12 +167,6 @@ the current release attempt. Those versi
 
 <p>The key ID value is an hexadecimal numbers with 8 digits (may be the last 8 digits
of a 40 digits number).
 It can be found be executing <code>gpg --list-keys</code>.</p>
-<p>Starts the GPG agent if not already done.
-This is for avoiding to be prompted many time for the passphrase in every modules to be built
by Maven.</p>
-<div class="codehilite"><pre><span class="nb">eval</span> <span
class="k">$(</span>gpg-agent --daemon<span class="k">)</span>
-</pre></div>
-
-
 <h2 id="directory-layout">Directory layout<a class="headerlink" href="#directory-layout"
title="Permanent link">&para;</a></h2>
 <p>The steps described in this page assume the following directory layout (some directories
will be created as
 a result of the steps). Any other layout can be used. However if the layout differs, then
the relative paths
@@ -193,20 +185,38 @@ in this page shall be adjusted according
 
 
 <h1 id="prepare-source">Review project status before branching<a class="headerlink"
href="#prepare-source" title="Permanent link">&para;</a></h1>
-<p>Before to start the release process, we need to test more extensively the master.
-The tests described below often reveal errors that were unnoticed in daily builds.
-It is better to detect and fix them before to create the branch.
-First:</p>
+<p>Replace the <code>$OLD_VERSION</code> number by <code>$NEW_VERSION</code>
in the following literals.
+Those changes need to be applied on the development branch and merged with all other branches
and master.</p>
 <ul>
-<li>Review and update the <code>README</code> and <code>NOTICE</code>
files on the source code repository.</li>
-<li>Review the <code>javac</code> and <code>javadoc</code>
warnings reported by Jenkins and fix at least the typos.</li>
-<li>
-<p>Tests the following commands:</p>
-<p>:::bash
-mvn clean install --define org.apache.sis.test.extensive=true
-mvn javadoc::aggregate</p>
-</li>
+<li><code>DOWNLOAD_URL</code> in <code>application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java</code>
file.</li>
+<li><code>&lt;sis.non-free.version&gt;</code> in root <code>pom.xml</code>
file.</li>
 </ul>
+<p>Commit and merge with other branches up to master.</p>
+<div class="codehilite"><pre>git commit --message<span class="o">=</span><span
class="s2">&quot;Set the EPSG geodetic dataset URL to its expected location after release.&quot;</span>
+<span class="c"># merge with master</span>
+</pre></div>
+
+
+<p>Before to start the release process, we need to test more extensively the master.
+The tests described below often reveal errors that were unnoticed in daily builds.
+It is better to detect and fix them before to create the release branch.
+First review and update the <code>README</code> and <code>NOTICE</code>
files on the source code repository.
+Then execute the following commands and fix as much warnings as practical:</p>
+<div class="codehilite"><pre>mvn clean install --define org.apache.sis.test.extensive<span
class="o">=</span><span class="nb">true</span>
+mvn javadoc:aggregate
+</pre></div>
+
+
+<p>If the <code>SIS_DATA</code> environment variable was set during above
build, unset it a try again.
+Ideally the build should be tested in both conditions (<code>SIS_DATA</code>
set and unset).
+That test may be done in a separated shell (console window) in order to preserve
+the variable value in the shell performing the release.</p>
+<div class="codehilite"><pre><span class="nb">unset </span>SIS_DATA
+<span class="nb">echo</span> <span class="nv">$SIS_DATA</span>
+mvn <span class="nb">test</span>
+</pre></div>
+
+
 <h2 id="release-notes">Prepare release notes<a class="headerlink" href="#release-notes"
title="Permanent link">&para;</a></h2>
 <p>We update JIRA soon because doing so is sometime a reminder of uncompleted tasks
in source code.
 Update <a href="http://issues.apache.org/jira/browse/SIS">JIRA</a> tasks and
prepare release notes as below:</p>
@@ -227,177 +237,134 @@ svn commit --message <span class="s2">&q
 </pre></div>
 
 
-<h2 id="test-master">Test master extensively<a class="headerlink" href="#test-master"
title="Permanent link">&para;</a></h2>
-<p>Build the project with the <code>apache-release</code> profile enabled.
-This profile performs the following actions:</p>
-<ul>
-<li>Enable extensive tests (i.e. it will set the <code>org.apache.sis.test.extensive</code>
property to <code>true</code>).</li>
-<li>Generate Javadoc. This may fail if the source code contains invalid Javadoc tags
or broken HTML.</li>
-<li>Generate additional binary artifacts (<code>*.zip</code> and <code>*.oxt</code>
files).
-    This will fail if duplicated class files or resources are found.
-    Consequently building the <code>*.zip</code> file is an additional test worth
to do before deployment.</li>
-<li>Sign the artifacts.</li>
-</ul>
-<p>Each of those additional products may cause a failure that did not happen in normal
builds.</p>
-<div class="codehilite"><pre>mvn clean install --activate-profiles apache-release
-</pre></div>
-
-
-<p>Verify signature for all files:</p>
-<div class="codehilite"><pre>find . -name <span class="s2">&quot;sis-*.asc&quot;</span>
-exec gpg --verify <span class="s1">&#39;{}&#39;</span> <span class="se">\;</span>
-</pre></div>
-
-
-<p>If the <code>SIS_DATA</code> environment variable was set during above
build, unset it a try again.
-Ideally the build should be tested in both conditions (<code>SIS_DATA</code>
set and unset).</p>
-<p>Build the <code>non-free</code> group of modules. Those modules will
not be part of the distribution (except on Maven),
-but we nevertheless need to ensure that they work. Before to test, verify that their version
numbers and their
-SIS dependencies are the snapshot tested in this section.</p>
-<div class="codehilite"><pre><span class="nb">cd</span> ../non-free
-svn update
-mvn clean install
-</pre></div>
-
-
-<p>Run the integration tests. Before to test,
-verify that their version numbers and their SIS dependencies are the snapshot tested in this
section.
-Note that execution of those tests may be slow.</p>
-<div class="codehilite"><pre><span class="nb">cd</span> ../release-test
-svn update
-<span class="nb">cd </span>maven
-mvn clean <span class="nb">test</span>
-</pre></div>
-
-
-<h2 id="prepare-code">Source code<a class="headerlink" href="#prepare-code" title="Permanent
link">&para;</a></h2>
-<p>Replace the <code>$OLD_VERSION</code> number by <code>$NEW_VERSION</code>
in the following literals.
-Those changes need to be applied on the development branch and merged with all other branches
and master.</p>
-<ul>
-<li><code>DOWNLOAD_URL</code> in <code>application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java</code>
file.</li>
-<li><code>&lt;sis.non-free.version&gt;</code> in root <code>pom.xml</code>
file.</li>
-</ul>
-<p>Commit and merge to other branches and to master.</p>
-<div class="codehilite"><pre>git commit --message <span class="s2">&quot;Set
the EPSG geodetic dataset URL to its expected location after release.&quot;</span>
-git checkout geoapi-3.1
-git merge
-<span class="c"># Repeat the above commit and the merge commands for other branches
until the changes are merged to master.</span>
-</pre></div>
-
-
-<h1 id="branch">Create branch and tag<a class="headerlink" href="#branch" title="Permanent
link">&para;</a></h1>
+<h1 id="branch">Create release branch<a class="headerlink" href="#branch" title="Permanent
link">&para;</a></h1>
 <p>Execute the following command:</p>
-<div class="codehilite"><pre>git checkout -b <span class="nv">$NEW_VERSION</span>
+<div class="codehilite"><pre>git checkout -b <span class="nv">$NEW_VERSION</span>-RC
 </pre></div>
 
 
 <p>It is okay to checkout the branch in a separated directory if desired.
-The <code>BRANCH_DIR</code> environment variable will specify that directory.</p>
-<div class="codehilite"><pre><span class="nb">export </span><span
class="nv">BRANCH_DIR</span><span class="o">=</span><span class="sb">`</span><span
class="nb">pwd</span><span class="sb">`</span>
+The <code>SIS_RC_DIR</code> environment variable will specify that directory.</p>
+<div class="codehilite"><pre><span class="nb">export </span><span
class="nv">SIS_RC_DIR</span><span class="o">=</span><span class="sb">`</span><span
class="nb">pwd</span><span class="sb">`</span>
 </pre></div>
 
 
-<p>We need to update the SIS version numbers not only in the <code>pom.xml</code>
files,
-but also in a few Java files. The following command performs the replacement using Ant.
-Note that this command does <em>not</em> yet remove the <code>-SNAPSHOT</code>
suffix in version numbers
-(this will be done later, at tag creation time):</p>
-<div class="codehilite"><pre>ant -buildfile core/sis-build-helper/src/main/ant/prepare-release.xml
branch -Dbranch.version<span class="o">=</span><span class="nv">$NEW_VERSION</span>
-Dsis.version<span class="o">=</span><span class="nv">$NEW_VERSION</span>
-</pre></div>
-
-
-<p>Open the root <code>pom.xml</code> file in an editor and perform the
following changes:</p>
-<ul>
-<li>Remove the whole <code>&lt;pluginRepositories&gt;</code> block
(including comment), since it should not be needed for releases (and is actually not allowed).</li>
-</ul>
 <p>Remove the modules that are not yet ready for a release.
 This may require removing <code>&lt;module&gt;</code> elements in the
parent <code>pom.xml</code> file.</p>
-<div class="codehilite"><pre>git rm storage/sis-shapefile
+<div class="codehilite"><pre>git rm core/sis-cql
+git rm core/sis-portrayal
+git rm storage/sis-shapefile
 git rm application/sis-javafx
+git rm application/sis-webapp
+git rm storage/sis-storage/src/main/java/org/apache/sis/storage/WritableGridCoverageResource.java
+git add --update    <span class="c"># for the removal of &lt;module&gt; elements
in pom.xml files.</span>
+git commit --message<span class="o">=</span><span class="s2">&quot;Remove
the modules to be excluded from $NEW_VERSION release.&quot;</span>
 </pre></div>
 
 
-<p>Validate with <code>git diff</code>, ensure that the build is not broken
(we will run the tests later),
-then commit the changes on the branch:</p>
-<div class="codehilite"><pre>mvn clean package --define <span class="nv">skipTests</span><span
class="o">=</span><span class="nb">true</span>
-git commit --message <span class="s2">&quot;Prepare branch for $NEW_VERSION release.&quot;</span>
-</pre></div>
-
-
-<h2 id="tag">Tag the branch<a class="headerlink" href="#tag" title="Permanent link">&para;</a></h2>
-<p>In theory, the next commands would be a real (non-dry) run of <code>mvn release:prepare</code>,
followed by <code>mvn release:perform</code>.
-However we perform those steps manually rather than relying on Maven for the following reasons:</p>
+<p>Open the root <code>pom.xml</code> file in an editor and perform the
following changes:</p>
 <ul>
-<li>Perform some additional changes on the tag.</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, for proper installation
of <code>sis-build-helper</code> plugin.</li>
-</ul>
-<p>First, create the tag:</p>
-<div class="codehilite"><pre>git tag <span class="nv">$NEW_VERSION</span>
+<li>Remove the whole <code>&lt;pluginRepositories&gt;</code> block
(including comment),
+    since it should not be needed for releases (and is actually not allowed).</li>
+<li>Remove the <code>jetty</code> dependency since the module that used
it has been removed.</li>
+</ul>
+<p>We need to update the SIS version numbers not only in the <code>pom.xml</code>
files, but also in a few Java files.
+The following command performs the replacement using Ant.</p>
+<div class="codehilite"><pre>ant -buildfile core/sis-build-helper/src/main/ant/prepare-release.xml
branch -Dsis.version<span class="o">=</span><span class="nv">$NEW_VERSION</span>
 </pre></div>
 
 
-<p>It is okay to checkout the tag in a separated directory if desired.
-The <code>TAG_DIR</code> environment variable will specify that directory.</p>
-<div class="codehilite"><pre><span class="nb">export </span><span
class="nv">TAG_DIR</span><span class="o">=</span><span class="sb">`</span><span
class="nb">pwd</span><span class="sb">`</span>
+<p>Validate with <code>git diff</code>, search <code>SNAPSHOT</code>
in the whole source directory in case we missed some, then commit:</p>
+<div class="codehilite"><pre><span class="n">git</span> <span
class="n">add</span> <span class="o">--</span><span class="n">update</span>
+<span class="n">mvn</span> <span class="n">clean</span> <span
class="n">install</span>
+<span class="n">git</span> <span class="n">commit</span> <span
class="o">--</span><span class="n">message</span><span class="p">=</span>&quot;<span
class="n">Set</span> <span class="n">version</span> <span class="n">number</span>
<span class="n">to</span> $<span class="n">NEW_VERSION</span><span
class="p">.</span>&quot;
 </pre></div>
 
 
-<p>Update versions number in <code>pom.xml</code> files (like what <code>mvn
release:prepare</code> would have done),
-plus some additional files:</p>
-<div class="codehilite"><pre>ant -buildfile core/sis-build-helper/src/main/ant/prepare-release.xml
tag -Dbranch.version<span class="o">=</span><span class="nv">$NEW_VERSION</span>
-Dsis.version<span class="o">=</span><span class="nv">$NEW_VERSION</span>
+<p>Maybe apply the following hacks on the release branch only (do not apply them on
master).
+Check first if those hacks are still needed for the next release (they were needed for 1.0):</p>
+<ul>
+<li>Remove all use of <code>javax.annotation.Generated</code> annotation.
+    This removal should not have any effect on compilation result.</li>
+<li>In the root <code>pom.xml</code> under <code>maven-javadoc-plugin</code>
configuration, add the following elements:<ul>
+<li><code>&lt;link&gt;http://sis.apache.org/apidocs&lt;/link&gt;</code>
inside <code>&lt;links&gt;</code> block.</li>
+<li><code>&lt;additionalOption&gt;-Xdoclint:all,-reference&lt;/additionalOption&gt;</code>
inside <code>&lt;additionalOptions&gt;</code> block.</li>
+</ul>
+</li>
+</ul>
+<h2 id="test-branch">Test branch extensively<a class="headerlink" href="#test-branch"
title="Permanent link">&para;</a></h2>
+<p>Build the project with the <code>apache-release</code> profile enabled.
+This profile performs the following actions:</p>
+<ul>
+<li>Enable extensive tests (i.e. it will set the <code>org.apache.sis.test.extensive</code>
property to <code>true</code>).</li>
+<li>Generate Javadoc. This may fail if the source code contains invalid Javadoc tags
or broken HTML.</li>
+<li>Generate additional binary artifacts (<code>*.zip</code> and <code>*.oxt</code>
files).
+    This will fail if duplicated class files or resources are found.
+    Consequently building the <code>*.zip</code> file is an additional test worth
to do before deployment.</li>
+<li>Sign the artifacts.</li>
+</ul>
+<p>Each of those additional products may cause a failure that did not happen in normal
builds.</p>
+<div class="codehilite"><pre>mvn clean install --activate-profiles apache-release
 </pre></div>
 
 
-<p>Validate with <code>git diff</code>, search <code>SNAPSHOT</code>
in the whole source directory in case we missed some, then commit:</p>
-<div class="codehilite"><pre>git commit --message <span class="s2">&quot;Fix
version number to $NEW_VERSION (no -SNAPSHOT).&quot;</span>
+<p>Verify signature for all files:</p>
+<div class="codehilite"><pre>find . -name <span class="s2">&quot;sis-*.asc&quot;</span>
-exec gpg --verify <span class="s1">&#39;{}&#39;</span> <span class="se">\;</span>
 </pre></div>
 
 
-<h2 id="branch-verify">Verify content<a class="headerlink" href="#branch-verify"
title="Permanent link">&para;</a></h2>
-<p>Build and test the project in the same way than we did on master.
-In addition to testing, execution of an <code>install</code> phase before deployment
is required for our custom <code>sis-build-helper</code> plugin.</p>
-<div class="codehilite"><pre>mvn install --activate-profiles apache-release
-find . -name <span class="s2">&quot;sis-*.asc&quot;</span> -exec gpg
--verify <span class="s1">&#39;{}&#39;</span> <span class="se">\;</span>
+<h2 id="maven-nonfree">Prepare non-free resources<a class="headerlink" href="#maven-nonfree"
title="Permanent link">&para;</a></h2>
+<p>Go to the directory that contains a checkout of <code>https://svn.apache.org/repos/asf/sis/data/non-free/sis-epsg</code>.
+Those modules will not be part of the distribution (except on Maven), but we nevertheless
need to ensure that they work.
+Replace occurrences of <code>&lt;version&gt;$OLD_VERSION&lt;/version&gt;</code>
by <code>&lt;version&gt;$NEW_VERSION&lt;/version&gt;</code> in
the <code>pom.xml</code> files.</p>
+<div class="codehilite"><pre><span class="nb">cd</span> ../non-free
+svn update
+mvn clean install
+svn commit --message <span class="s2">&quot;Set version number and dependencies
to $NEW_VERSION.&quot;</span>
 </pre></div>
 
 
-<p>Open the <code>pom.xml</code> file of all modules in the <code>non-free</code>
group.
-Set their version numbers and their SIS dependencies to <code>$NEW_VERSION</code>
without <code>-SNAPSHOT</code> suffix.
-In the root <code>pom.xml</code> file, remove the <code>&lt;scope&gt;provider&lt;/scope&gt;</code>
line.
-Create tags and trunk directories.
-Commit and built:</p>
-<div class="codehilite"><pre><span class="nb">cd</span> ../../non-free
-svn commit --message <span class="s2">&quot;Set version number and dependencies
to $NEW_VERSION.&quot;</span>
-mvn clean install
+<p>We deploy the non-free resources in a Nexus repository separated from the rest of
Apache SIS for allowing tests later.
+If there is any issue with this deployment, the staging repository can easily be dropped
and recreated.</p>
+<div class="codehilite"><pre>mvn deploy --activate-profiles apache-release
 </pre></div>
 
 
-<p>Open the <code>pom.xml</code> file of integration tests.
-Set its version numbers and its SIS dependencies to <code>$NEW_VERSION</code>
without <code>-SNAPSHOT</code> suffix.
-Commit and built (note that execution may be slow).</p>
+<p>Note the URL printed by Maven to the console during the deployment phase.
+They will be needed for the next step.</p>
+<h2 id="integration-tests">Integration test<a class="headerlink" href="#integration-tests"
title="Permanent link">&para;</a></h2>
+<p>Open the root <code>pom.xml</code> file of integration tests.
+Set version numbers to <code>$NEW_VERSION</code> without <code>-SNAPSHOT</code>
suffix.
+Then go to the <code>&lt;url&gt;</code> declaration of the first <code>&lt;repository&gt;</code>
and replace value by the URL
+of the temporary Maven repository created by Nexus, as noted during deployment in above step.
+Usually, only the 3 last digits need to be updated.
+Verify the configuration and version of Maven plugins.
+Then test and commit (note that execution may be slow).</p>
 <div class="codehilite"><pre><span class="nb">cd</span> ../release-test
-svn commit --message <span class="s2">&quot;Set version number and dependencies
to $NEW_VERSION.&quot;</span>
+svn update
 <span class="nb">cd </span>maven
 mvn clean <span class="nb">test</span>
+svn commit --message <span class="s2">&quot;Set version number and dependencies
to $NEW_VERSION.&quot;</span>
 </pre></div>
 
 
 <h1 id="maven-deploy">Deploy Maven artifacts<a class="headerlink" href="#maven-deploy"
title="Permanent link">&para;</a></h1>
-<p>If above verifications succeeded, deploy:</p>
-<div class="codehilite"><pre>chmod a-w target/distribution/*.zip
-mvn deploy --activate-profiles apache-release
+<p>If above verifications succeeded, performs the following <em>temporary</em>
changes
+(to be discarded after the deployment to Maven repository):</p>
+<ul>
+<li>Remove temporarily the <code>sis-openoffice</code> module from <code>application/pom.xml</code>.</li>
+<li>Remove the <code>test-jar</code> goal from <code>maven-jar-plugin</code>
in the root <code>pom.xml</code>.</li>
+</ul>
+<p>Then deploy SIS. Deploy also the non-free modules:</p>
+<div class="codehilite"><pre>mvn clean deploy --activate-profiles apache-release
 </pre></div>
 
 
 <h2 id="nexus-close">Verify and close the Nexus release artifacts<a class="headerlink"
href="#nexus-close" title="Permanent link">&para;</a></h2>
 <p>Verify the staged artifacts in the <a href="https://repository.apache.org/index.html">Nexus
repository</a>.
 The artifacts can be found under <em>Build Promotion</em> → <em>Staging
repositories</em>, and searching for <code>org.apache.sis</code> in the
<em>Repository</em> column.
-Navigate through the artifact tree and make sure that all javadoc, source, test and jar files
have <code>.asc</code> (GPG signature) and <code>.md5</code> files.</p>
-<p>Additional references about signatures:</p>
-<ul>
-<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.
+Navigate through the artifact tree and make sure that all javadoc, source, test and jar files
have <code>.asc</code> (GPG signature) and <code>.md5</code> files.
+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,
@@ -417,17 +384,7 @@ so try to see at least one code snippet.
 </ul>
 <p>We will announce later (in the <cite>Put the release candidate up for a vote</cite>
section) on the <code>dev@</code> mailing list
 the availability of this temporary repository for testing purpose.</p>
-<h2 id="maven-nonfree">Deploy non-free resources to Nexus<a class="headerlink" href="#maven-nonfree"
title="Permanent link">&para;</a></h2>
-<p>We deploy the non-free resources in a separated Nexus repository for allowing deployment
of those resources to Maven Central
-before deployment of the rest of Apache SIS. This allows to test that the URL to those resources
in Apache SIS are correct.</p>
-<p>Go to the directory that contains a checkout of <code>https://svn.apache.org/repos/asf/sis/data/non-free/sis-epsg</code>.
-Replace occurrences of <code>&lt;version&gt;$OLD_VERSION&lt;/version&gt;</code>
by <code>&lt;version&gt;$NEW_VERSION&lt;/version&gt;</code> in
the root <code>pom.xml</code>.
-Deploy:</p>
-<div class="codehilite"><pre>mvn deploy --activate-profiles apache-release
-</pre></div>
-
-
-<p>In Nexus:</p>
+<p>In the Nexus repository used for non-free resources:</p>
 <ul>
 <li>Delete all <code>*-source-release.zip.*</code> files since they duplicate
the <code>*-source.zip.*</code> files.</li>
 <li>In the <code>sis-epsg-$NEW_VERSION.jar</code> file, verify that <code>META-INF/LICENSE</code>
contain the EPSG terms of use.</li>
@@ -471,7 +428,7 @@ getting the Javadoc enhancements expecte
 avoiding the security vulnerability discovered in the Javadoc tools of older JDK releases,
 and keeping the <code>diff</code> smaller on the SVN repository of SIS web site.
 If JDK8 is <em>not</em> used, then omit the <code>cp</code> command
below.</p>
-<div class="codehilite"><pre><span class="nb">cd</span> <span
class="nv">$TAG_DIR</span>
+<div class="codehilite"><pre><span class="nb">cd</span> <span
class="nv">$SIS_RC_DIR</span>
 mvn javadoc:aggregate
 <span class="nb">cd </span>target/site
 zip -9 -r apache-sis-<span class="nv">$NEW_VERSION</span>-doc.zip apidocs
@@ -508,9 +465,9 @@ Update the file content if necessary.</p
 
 
 <p>Move the files generated by Maven to the distribution directory:</p>
-<div class="codehilite"><pre>mv <span class="nv">$TAG_DIR</span>/target/sis-<span
class="nv">$NEW_VERSION</span>-* .
-mv <span class="nv">$TAG_DIR</span>/target/site/apache-sis-<span class="nv">$NEW_VERSION</span>-*
.
-mv <span class="nv">$TAG_DIR</span>/application/sis-console/target/distribution/apache-sis-<span
class="nv">$NEW_VERSION</span>.zip .
+<div class="codehilite"><pre>mv <span class="nv">$SIS_RC_DIR</span>/target/sis-<span
class="nv">$NEW_VERSION</span>-* .
+mv <span class="nv">$SIS_RC_DIR</span>/target/site/apache-sis-<span class="nv">$NEW_VERSION</span>-*
.
+mv <span class="nv">$SIS_RC_DIR</span>/application/sis-console/target/distribution/apache-sis-<span
class="nv">$NEW_VERSION</span>.zip .
 </pre></div>
 
 



Mime
View raw message