sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1031511 - in /websites/staging/sis/trunk/content: ./ DOAP.rdf branches.html contributor.html index.html release-management-setup.html release-management.html
Date Wed, 20 Jun 2018 10:49:17 GMT
Author: buildbot
Date: Wed Jun 20 10:49:16 2018
New Revision: 1031511

Log:
Staging update by buildbot for sis

Modified:
    websites/staging/sis/trunk/content/   (props changed)
    websites/staging/sis/trunk/content/DOAP.rdf
    websites/staging/sis/trunk/content/branches.html
    websites/staging/sis/trunk/content/contributor.html
    websites/staging/sis/trunk/content/index.html
    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 Jun 20 10:49:16 2018
@@ -1 +1 @@
-1833858
+1833905

Modified: websites/staging/sis/trunk/content/DOAP.rdf
==============================================================================
Binary files - no diff available.

Modified: websites/staging/sis/trunk/content/branches.html
==============================================================================
--- websites/staging/sis/trunk/content/branches.html (original)
+++ websites/staging/sis/trunk/content/branches.html Wed Jun 20 10:49:16 2018
@@ -138,9 +138,9 @@ They are caused by changes in the underl
 The content of this branch may be fully merged to <code>master</code> in the
future, depending on new GeoAPI releases from OGC.</p>
 <h2 id="geoapi-3.1">GeoAPI 3.1 branch<a class="headerlink" href="#geoapi-3.1" title="Permanent
link">&para;</a></h2>
 <p>The <code>geoapi-3.1</code> branch implements the interfaces defined
in <a href="http://www.geoapi.org/snapshot/index.html">GeoAPI 3.1 snapshot</a>
milestones.
-It has the same content that the <code>geoapi-4.0</code> branch, excluding changes
that are incompatible with GeoAPI 3.0.
+It has the same content that the <code>geoapi-4.0</code> branch, excluding changes
that are incompatible with GeoAPI 3.0.1.
 Developments happen on <code>geoapi-4.0</code> and are periodically merged to
<code>geoapi-3.1</code> with the necessary modifications.
-This branch is used merely as an intermediate step between the <code>geoapi-4.0</code>
branch and <code>master</code>.
+This branch is used merely as an intermediate step between the development branch (<code>geoapi-4.0</code>)
and <code>master</code>.
 Its content may be fully merged to <code>master</code> in the future, after new
GeoAPI releases from OGC.</p>
 <h2 id="master">master<a class="headerlink" href="#master" title="Permanent link">&para;</a></h2>
 <p>The master is a merge of <code>geoapi-3.1</code> branch ported to the
interfaces defined by the <a href="http://www.geoapi.org/3.0/index.html">GeoAPI stable
release</a>.
@@ -198,7 +198,7 @@ conflicts with the platform-dependent im
 <p>When using a JDK9 class that does not exist on JDK8, define a class of the same
name in a
 <code>org.apache.sis.internal</code> sub-package with the minimal amount of needed
functionalities,
 provided that it can be done with reasonable effort. Otherwise just delete the JDK9-dependent
-code from the JDK8 branch.</p>
+code from the development branch.</p>
             </article>
           </section>
         </div><!--/span-->

Modified: websites/staging/sis/trunk/content/contributor.html
==============================================================================
--- websites/staging/sis/trunk/content/contributor.html (original)
+++ websites/staging/sis/trunk/content/contributor.html Wed Jun 20 10:49:16 2018
@@ -116,11 +116,6 @@ effective computer programming.</p>
 <li><a href="#modules">The SIS library modules</a></li>
 </ul>
 </li>
-<li><a href="#source">Fetching and editing source code</a></li>
-<li><a href="#commit">Committing changes</a><ul>
-<li><a href="#svn-config">Configuring Subversion properties</a></li>
-</ul>
-</li>
 </ul>
 </div>
 <h1 id="knowledge">Background Knowledge<a class="headerlink" href="#knowledge" title="Permanent
link">&para;</a></h1>
@@ -184,83 +179,6 @@ by Apache SIS.</p>
 <h2 id="modules">The SIS library modules<a class="headerlink" href="#modules" title="Permanent
link">&para;</a></h2>
 <p>Contributors should gain a basic understanding of the core library including the
separation into modules,
 the functionality available in the base module, and the functioning of the modules of interest.</p>
-<h1 id="source">Fetching and editing source code<a class="headerlink" href="#source"
title="Permanent link">&para;</a></h1>
-<p>Different SIS <a href="branches.html">branches</a> are available depending
on the target platforms.
-Unless working on a SIS port (e.g. the Android platform), contributors are encouraged
-to work on the SIS branch targeting the most recent JDK platform (currently JDK8):</p>
-<div class="codehilite"><pre>svn checkout https://svn.apache.org/repos/asf/sis/branches/JDK8
sis
-<span class="nb">cd </span>sis
-mvn install
-</pre></div>
-
-
-<p>The <a href="source.html">Source code</a> page provides tips for opening
the files in an IDE,
-and guidelines about the way SIS source code is organized.</p>
-<h1 id="commit">Committing changes<a class="headerlink" href="#commit" title="Permanent
link">&para;</a></h1>
-<p>Copies or displacements of files shall be done with the <code>svn copy</code>
or <code>svn move</code> command, respectively.
-Be aware that not all IDE or graphical tools perform this action appropriately.
-<strong>Always verify on the command-line</strong>, at least the first times
that a new tools is used, by executing <code>svn status</code>.
-Files that have been moved or copied shall have a <code>+</code> symbol in the
left margin, like below:</p>
-<div class="codehilite"><pre>D       my-directory/the-old-filename
-A  +    my-directory/the-new-filename
-</pre></div>
-
-
-<p>Using the proper SVN command is necessary for preserving the history, preserving
the <a href="#svn-config">SVN properties</a>,
-and consuming less space on the Apache server hosting the source code repository.</p>
-<h2 id="svn-config">Configuring Subversion properties<a class="headerlink" href="#svn-config"
title="Permanent link">&para;</a></h2>
-<p>Subversion can associate properties to each tracked files. Those properties tell
to Subversion
-how to handle platform-specific aspects like end-of-line characters, and how to serve the
files
-to web browsers (MIME type, encoding, <i>etc.</i>).
-Those properties are typically set when a new file is added, not during modifications.
-Developers can specify default properties for all their Subversion working copies as below:</p>
-<ul>
-<li>Open <code>~/.subversion/config</code> in an editor, where <code>~</code>
is the user home directory.</li>
-<li>Set the <code>enable-auto-props</code> value to <code>yes</code>.</li>
-<li>Scroll down to the <code>[auto-props]</code> section and make sure
to assign the appropriate
-    (usually <code>native</code>) value to the End Of Line (EOL) style of the
files to be edited.</li>
-</ul>
-<p>Below is an example of a portion of Subversion configuration file
-(real configuration files are typically larger):</p>
-<div class="codehilite"><pre><span class="k">[miscellany]</span>
-<span class="c"># Whitespace-delimited globs which Subversion will ignore in its &#39;status&#39;
output.</span>
-<span class="na">global-ignores</span> <span class="o">=</span> <span
class="s">*.class *.jar .* *~</span>
-
-<span class="c"># Enables automatic properties (defined below) for &#39;svn add&#39;
and &#39;svn import&#39;.</span>
-<span class="na">enable-auto-props</span> <span class="o">=</span>
<span class="s">yes</span>
-
-<span class="c"># Section for configuring automatic properties.</span>
-<span class="c"># The file-name-pattern can contain wildcards such as &#39;*&#39;
and &#39;?&#39;.</span>
-<span class="c"># All entries which match will be applied to the file.</span>
-<span class="k">[auto-props]</span>
-<span class="na">*.java</span>       <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native</span>
-<span class="na">*.sql</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native</span>
-<span class="na">*.txt</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native</span>
-<span class="na">*.properties</span> <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native</span>
-<span class="na">*.xml</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native</span>
-<span class="na">*.xsd</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native</span>
-<span class="na">*.sld</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native</span>
-<span class="na">*.gml</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/xml;svn:eol-style=native</span>
-<span class="na">*.xsl</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/xsl;svn:eol-style=native</span>
-<span class="na">*.html</span>       <span class="o">=</span> <span
class="s">svn:mime-type=text/html;svn:eol-style=native</span>
-<span class="na">*.xhtml</span>      <span class="o">=</span> <span
class="s">svn:mime-type=text/html;svn:eol-style=native</span>
-<span class="na">*.css</span>        <span class="o">=</span> <span
class="s">svn:mime-type=text/css;svn:eol-style=native</span>
-<span class="na">*.bat</span>        <span class="o">=</span> <span
class="s">svn:eol-style=CRLF</span>
-<span class="na">*.sh</span>         <span class="o">=</span> <span
class="s">svn:eol-style=native;svn:executable</span>
-<span class="na">*.bmp</span>        <span class="o">=</span> <span
class="s">svn:mime-type=image/bmp</span>
-<span class="na">*.png</span>        <span class="o">=</span> <span
class="s">svn:mime-type=image/png</span>
-<span class="na">*.jpg</span>        <span class="o">=</span> <span
class="s">svn:mime-type=image/jpeg</span>
-<span class="na">*.jpeg</span>       <span class="o">=</span> <span
class="s">svn:mime-type=image/jpeg</span>
-<span class="na">*.gif</span>        <span class="o">=</span> <span
class="s">svn:mime-type=image/gif</span>
-<span class="na">*.tif</span>        <span class="o">=</span> <span
class="s">svn:mime-type=image/tiff</span>
-<span class="na">*.tiff</span>       <span class="o">=</span> <span
class="s">svn:mime-type=image/tiff</span>
-<span class="na">*.zip</span>        <span class="o">=</span> <span
class="s">svn:mime-type=application/zip</span>
-<span class="na">*.utf</span>        <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">*.shp</span>        <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">*.shx</span>        <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">*.dbf</span>        <span class="o">=</span> <span
class="s">svn:mime-type=application/octet-stream</span>
-<span class="na">README</span>       <span class="o">=</span> <span
class="s">svn:mime-type=text/plain;svn:eol-style=native</span>
-</pre></div>
             </article>
           </section>
         </div><!--/span-->

Modified: websites/staging/sis/trunk/content/index.html
==============================================================================
--- websites/staging/sis/trunk/content/index.html (original)
+++ websites/staging/sis/trunk/content/index.html Wed Jun 20 10:49:16 2018
@@ -155,7 +155,7 @@ However a command-line tool is provided
 <li><a href="contributor.html">New contributor</a>: background knowledge.</li>
 <li><a href="source.html">Source code</a>: fetching the code, opening in
an IDE, formatting.</li>
 <li><a href="build.html">Build</a>: build from the source, create the PACK200
file.</li>
-<li><a href="branches.html">Branches</a>: trunk, JDK8, JDK9.</li>
+<li><a href="branches.html">Branches</a>: master, geoapi-3.1, geoapi-4.0</li>
 <li><a href="http://issues.apache.org/jira/browse/SIS">Issue tracking</a>:
JIRA.</li>
 <li><a href="release-management.html">Release management</a> (for release
managers)</li>
 <li><a href="site-management.html">Web site management</a> (for release
managers and site maintainers)</li>

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 Jun 20 10:49:16 2018
@@ -114,10 +114,10 @@ If those steps have already been done, j
 </div>
 <h1 id="directory-layout">Directory layout<a class="headerlink" href="#directory-layout"
title="Permanent link">&para;</a></h1>
 <p>The steps described in the <em>release management</em> page assume the
following directory layout.
-Some directories are SVN checkout, other are ordinary directories. Any other layout can be
used.
+Some directories are Git checkout, other are ordinary directories. Any other layout can be
used.
 However in the later case, all relative paths in the <em>release management</em>
page will need to be adjusted accordingly.</p>
 <div class="codehilite"><pre>&lt;any root directory for SIS&gt;
-├─ trunk
+├─ master
 ├─ branches
 ├─ tags
 ├─ non-free
@@ -131,7 +131,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
+<div class="codehilite"><pre>git clone    https://gitbox.apache.org/repos/asf/sis.git
master
 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
@@ -222,7 +222,7 @@ gpg --send-key &lt;key_id&gt;
 
 
 <p>The above-cited <em>Release Signing</em> page provides more instructions.
-Then, the signed public key shall be appended to the <code>KEYS</code> file on
the <a href="https://svn.apache.org/repos/asf/sis/trunk/">SIS source code repository</a>,
+Then, the signed public key shall be appended to the <code>KEYS</code> file on
the <a href="https://gitbox.apache.org/repos/asf?p=sis.git">SIS source code repository</a>,
 then copied to the <a href="http://dist.apache.org/repos/dist/release/sis/">SIS distribution
directory</a>.</p>
 <h1 id="maven">Maven Configuration &amp; Nexus Setup<a class="headerlink" href="#maven"
title="Permanent link">&para;</a></h1>
 <p>Detailed instructions are at <a href="http://www.apache.org/dev/publishing-maven-artifacts.html">Publishing
Maven Artifacts</a>.

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 Jun 20 10:49:16 2018
@@ -112,7 +112,7 @@ The intended audiences are SIS release m
 <li><a href="#prepare-source">Prepare web site and source code before branching</a><ul>
 <li><a href="#release-notes">Prepare release notes</a></li>
 <li><a href="#prepare-website">Web site</a></li>
-<li><a href="#test-trunk">Test trunk extensively</a></li>
+<li><a href="#test-master">Test master extensively</a></li>
 <li><a href="#prepare-code">Source code</a></li>
 </ul>
 </li>
@@ -144,7 +144,7 @@ The intended audiences are SIS release m
 <li><a href="#announce">Announce the release</a></li>
 </ul>
 </li>
-<li><a href="#next-release">Update trunk for the next development cycle</a><ul>
+<li><a href="#next-release">Update master for the next development cycle</a><ul>
 <li><a href="#nexus-clean">Delete old artifacts on Maven snapshot repository</a></li>
 </ul>
 </li>
@@ -186,7 +186,7 @@ This is for avoiding to be prompted many
 a result of the steps). Any other layout can be used. However if the layout differs, then
the relative paths
 in this page shall be adjusted accordingly.</p>
 <div class="codehilite"><pre>&lt;any root directory for SIS&gt;
-├─ trunk
+├─ master
 ├─ branches
 │  └─ $NEW_VERSION
 ├─ tags
@@ -211,7 +211,7 @@ We recommend to create the release with
 Make sure that the JDK installation to be used for the release has been updated recently,
since compilers may receive critical bug fixes.
 For example the <code>javadoc</code> tool of older JDK versions was known to
generate HTML pages with a vulnerability in them.</p>
 <h1 id="prepare-source">Prepare web site and source code 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 trunk.
+<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>
@@ -252,7 +252,7 @@ svn commit --message <span class="s2">&q
 
 <p>The new web site will be published in the <a href="http://sis.staging.apache.org">staging
area</a>.
 It will not yet be published on <code>http://sis.apache.org</code>.</p>
-<h2 id="test-trunk">Test trunk extensively<a class="headerlink" href="#test-trunk"
title="Permanent link">&para;</a></h2>
+<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>
@@ -264,7 +264,7 @@ This profile performs the following acti
 <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><span class="nb">cd</span> ../trunk
+<div class="codehilite"><pre><span class="nb">cd</span> ../master
 mvn clean install --activate-profiles apache-release --define <span class="nv">bootclasspath</span><span
class="o">=</span><span class="nv">$BOOTCLASSPATH</span>
 </pre></div>
 
@@ -297,37 +297,32 @@ mvn clean <span class="nb">test</span> -
 
 <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 trunk.</p>
+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 trunk.</p>
-<div class="codehilite"><pre>svn commit --message <span class="s2">&quot;Set
the EPSG geodetic dataset URL to its expected location after release.&quot;</span>
-<span class="nb">cd</span> ../JDK7
-svn merge ../JDK8
-<span class="c"># Repeat the above commit and the merge commands for other branches
until the changes are merged to trunk.</span>
+<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>
 <p>Execute the following command:</p>
-<div class="codehilite"><pre>svn copy https://svn.apache.org/repos/asf/sis/trunk
<span class="se">\</span>
-         https://svn.apache.org/repos/asf/sis/branches/<span class="nv">$NEW_VERSION</span>
<span class="se">\</span>
-         --message <span class="s2">&quot;Create the $NEW_VERSION branch.&quot;</span>
+<div class="codehilite"><pre>git checkout -b <span class="nv">$NEW_VERSION</span>
 </pre></div>
 
 
-<p>Move to a directory containing the project branches (presumed to be <code>../branches</code>
in the following command,
-but can be replaced by anything else), then checkout a clean copy of the branch to release:</p>
-<div class="codehilite"><pre><span class="nb">cd</span> ../branches
-svn checkout https://svn.apache.org/repos/asf/sis/branches/<span class="nv">$NEW_VERSION</span>
-<span class="nb">cd</span> <span class="nv">$NEW_VERSION</span>
-<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>
+<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>
 </pre></div>
 
 
-<p>We need to update the Subversion URL and SIS version numbers not only in the <code>pom.xml</code>
files,
+<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>
@@ -341,15 +336,15 @@ Note that this command does <em>not</em>
 </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>svn remove storage/sis-shapefile
-svn remove application/sis-javafx
+<div class="codehilite"><pre>git rm storage/sis-shapefile
+git rm application/sis-javafx
 </pre></div>
 
 
-<p>Validate with <code>svn diff</code>, ensure that the build is not broken
(we will run the tests later),
+<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> --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>
+git commit --message <span class="s2">&quot;Prepare branch for $NEW_VERSION release.&quot;</span>
 </pre></div>
 
 
@@ -358,22 +353,17 @@ svn commit --message <span class="s2">&q
 However we perform those steps manually rather than relying on Maven for the following reasons:</p>
 <ul>
 <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, for proper installation
of <code>sis-build-helper</code> plugin.</li>
 </ul>
 <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 $NEW_VERSION tag for RC$RELEASE_CANDIDATE.&quot;</span>
+<div class="codehilite"><pre>git tag <span class="nv">$NEW_VERSION</span>
 </pre></div>
 
 
-<p>Checkout:</p>
-<div class="codehilite"><pre><span class="nb">cd</span> ../../tags
-svn checkout https://svn.apache.org/repos/asf/sis/tags/<span class="nv">$NEW_VERSION</span>
-<span class="nb">cd</span> <span class="nv">$NEW_VERSION</span>
-<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>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>
 </pre></div>
 
 
@@ -383,13 +373,13 @@ plus some additional files:</p>
 </pre></div>
 
 
-<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>
+<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>
 </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 trunk.
+<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 --define
<span class="nv">bootclasspath</span><span class="o">=</span><span
class="nv">$BOOTCLASSPATH</span>
 find . -name <span class="s2">&quot;sis-*.asc&quot;</span> -exec gpg
--verify <span class="s1">&#39;{}&#39;</span> <span class="se">\;</span>
@@ -724,15 +714,15 @@ svn delete https://dist.apache.org/repos
 </pre></div>
 
 
-<h1 id="next-release">Update trunk for the next development cycle<a class="headerlink"
href="#next-release" title="Permanent link">&para;</a></h1>
+<h1 id="next-release">Update master for the next development cycle<a class="headerlink"
href="#next-release" title="Permanent link">&para;</a></h1>
 <p>On the development branch (usually JDK8),
-update the version numbers in the <code>pom.xml</code> files on trunk with the
following command:</p>
+update the version numbers in the <code>pom.xml</code> files on master with the
following command:</p>
 <div class="codehilite"><pre>mvn clean
 mvn release:update-versions --define <span class="nv">autoVersionSubmodules</span><span
class="o">=</span><span class="nb">true</span>
 </pre></div>
 
 
-<p>This change will need to be merged manually on the JDK7 branch and on the trunk.
+<p>This change will need to be merged manually on the JDK7 branch and on the master.
 Then on the development branch:</p>
 <ul>
 <li>Edit the version number in the <code>application/sis-console/src/main/artifact/README</code>
file.</li>



Mime
View raw message