sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1020666 - in /websites/staging/sis/trunk/content: ./ release-management-setup.html release-management.html
Date Fri, 10 Nov 2017 18:56:51 GMT
Author: buildbot
Date: Fri Nov 10 18:56:51 2017
New Revision: 1020666

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 Fri Nov 10 18:56:51 2017
@@ -1 +1 @@
-1814863
+1814904

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 Fri Nov 10 18:56:51 2017
@@ -127,7 +127,7 @@ However in the later case, all relative
 
 <p>Create the above directory structure as below:</p>
 <div class="codehilite"><pre>svn checkout https://svn.apache.org/repos/asf/sis/trunk
-svn checkout https://svn.apache.org/repos/asf/sis/non-free
+svn checkout https://svn.apache.org/repos/asf/sis/data/non-free
 svn checkout https://svn.apache.org/repos/asf/sis/release-test
 svn checkout https://svn.apache.org/repos/asf/sis/site/trunk site
 svn checkout https://dist.apache.org/repos/dist/dev/sis distribution

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 Fri Nov 10 18:56:51 2017
@@ -111,8 +111,8 @@ The intended audiences are SIS release m
 </ul>
 </li>
 <li><a href="#branch">Create branch and tag</a><ul>
-<li><a href="#branch-verify">Verify content</a></li>
 <li><a href="#tag">Tag the branch</a></li>
+<li><a href="#branch-verify">Verify content</a></li>
 </ul>
 </li>
 <li><a href="#maven-deploy">Deploy Maven artifacts</a><ul>
@@ -181,6 +181,8 @@ in this page shall be adjusted according
 │  └─ $NEW_VERSION
 │     └─ target
 │        └─ distributions
+├─ non-free
+│  └─ sis-epsg
 ├─ distribution
 │  └─ $NEW_VERSION
 │     └─ RC$RELEASE_CANDIDATE
@@ -204,7 +206,8 @@ For example the <code>javadoc</code> too
 <li>Ensure that the <code>trunk</code> build is successful (including tests)
with JDK7 and JDK8.</li>
 </ul>
 <h2 id="prepare-documentation">Documentation<a class="headerlink" href="#prepare-documentation"
title="Permanent link">&para;</a></h2>
-<p>Update <a href="http://issues.apache.org/jira/browse/SIS">JIRA</a> tasks
and prepare release notes as below:</p>
+<p>We update JIRA and web site first 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>
 <ul>
 <li>Ensure that the <em>Fix Version</em> in issues resolved since the last
release includes this release version correctly.</li>
 <li>Ensure that all open issues are resolved or closed before proceeding further.</li>
@@ -268,7 +271,7 @@ svn checkout https://svn.apache.org/repo
 <p>We need to update the Subversion URL and 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):</p>
+(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>
 
@@ -277,37 +280,17 @@ Note that this command does <em>not</em>
 <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:</p>
+<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>svn remove storage/sis-shapefile
 svn remove application/sis-javafx
 </pre></div>
 
 
-<p>Commit the changes on the branch:</p>
-<div class="codehilite"><pre>svn commit --message <span class="s2">&quot;Prepare
the branch for the $NEW_VERSION release.&quot;</span>
-</pre></div>
-
-
-<h2 id="branch-verify">Verify content<a class="headerlink" href="#branch-verify"
title="Permanent link">&para;</a></h2>
-<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>
-
-
-<p>Try a dry run of the <code>release:prepare</code> goal. This goals checks
for <code>SNAPSHOT</code> dependencies in <code>pom.xml</code> files.
-It will not complete the prepare goal until all snapshot dependencies are resolved.
-If anything goes wrong, the directory can be cleaned by running the <code>release:clean</code>
goal
-before to fix the problem and try again.</p>
-<div class="codehilite"><pre>mvn release:prepare --define <span class="nv">releaseVersion</span><span
class="o">=</span><span class="nv">$NEW_VERSION</span> --define <span
class="nv">tag</span><span class="o">=</span><span class="nv">$NEW_VERSION</span>
--define <span class="nv">bootclasspath</span><span class="o">=</span><span
class="nv">$BOOTCLASSPATH</span> <span class="se">\</span>
-    --define <span class="nv">autoVersionSubmodules</span><span class="o">=</span><span
class="nb">true</span> --define <span class="nv">updateWorkingCopyVersions</span><span
class="o">=</span><span class="nb">false</span> --define <span class="nv">dryRun</span><span
class="o">=</span><span class="nb">true</span>
-</pre></div>
-
-
-<p>The dry run will not commit any changes back to SVN. Instead, it will create <code>pom.xml.tag</code>
files containing
-the changes that would have been committed to SVN. We keep those files for verification purpose
in the next section.</p>
-<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>
+<p>Validate with <code>svn 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 install --define <span class="nv">skipTests</span><span
class="o">=</span><span class="nb">true</span> --define <span class="nv">bootclasspath</span><span
class="o">=</span><span class="nv">$BOOTCLASSPATH</span>
+svn commit --message <span class="s2">&quot;Prepare branch for $NEW_VERSION release.&quot;</span>
 </pre></div>
 
 
@@ -323,7 +306,7 @@ However we perform those steps manually
 <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">&quot;Create the $NEW_VERSION tag for RC$RELEASE_CANDIDATE.&quot;</span>
+         --message <span class="s2">&quot;Create $NEW_VERSION tag for RC$RELEASE_CANDIDATE.&quot;</span>
 </pre></div>
 
 
@@ -341,21 +324,43 @@ plus some additional files:</p>
 </pre></div>
 
 
-<p>Compare with the modifications done by <code>mvn release:prepare</code>.
The following command should report no difference,
-ignoring the license or other information that may have been removed by the Maven plugin
-(this has been known to happen if the starting <code>&lt;project&gt;</code>
tag is not on a single line).</p>
-<div class="codehilite"><pre>find . -name <span class="s2">&quot;pom.xml&quot;</span>
-exec diff <span class="s1">&#39;{}&#39;</span> <span class="nv">$BRANCH_DIR</span>/<span
class="s1">&#39;{}&#39;</span>.tag <span class="se">\;</span>
+<p>Validate with <code>svn diff</code>, search <code>SNAPSHOT</code>
in the whole source directory in case we missed some, then commit:</p>
+<div class="codehilite"><pre>svn commit --message <span class="s2">&quot;Fix
version number to $NEW_VERSION (no -SNAPSHOT) and SVN directory.&quot;</span>
 </pre></div>
 
 
-<p>Commit:</p>
-<div class="codehilite"><pre>svn commit --message <span class="s2">&quot;Fix
version number and SVN directory.&quot;</span>
+<h2 id="branch-verify">Verify content<a class="headerlink" href="#branch-verify"
title="Permanent link">&para;</a></h2>
+<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>
+
+
+<p>Build the project with extensive tests enabled:</p>
+<div class="codehilite"><pre>mvn clean install --activate-profiles apache-release
--define org.apache.sis.test.extensive<span class="o">=</span><span class="nb">true</span>
--define <span class="nv">bootclasspath</span><span class="o">=</span><span
class="nv">$BOOTCLASSPATH</span>
+</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>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 <code>$NEW_VERSION</code> without <code>-SNAPSHOT</code>
suffix.</p>
+<div class="codehilite"><pre><span class="nb">cd</span> ../../non-free
+svn update
+mvn clean install --define <span class="nv">bootclasspath</span><span class="o">=</span><span
class="nv">$BOOTCLASSPATH</span>
 </pre></div>
 
 
-<p>Clean the branch, since we will not need it anymore:</p>
-<div class="codehilite"><pre><span class="nb">cd</span> <span
class="nv">$BRANCH_DIR</span>
-mvn clean release:clean
+<p>Run the integration tests. The project version number in the <code>pom.xml</code>
file must be set manually to <code>$NEW_VERSION</code> first.
+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> --define <span class="nv">bootclasspath</span><span
class="o">=</span><span class="nv">$BOOTCLASSPATH</span>
 </pre></div>
 
 



Mime
View raw message