Author: buildbot
Date: Fri Jan 26 11:34:00 2018
New Revision: 1024346
Log:
Staging update by buildbot for sis
Modified:
websites/staging/sis/trunk/content/ (props changed)
websites/staging/sis/trunk/content/branches.html
websites/staging/sis/trunk/content/build.html
websites/staging/sis/trunk/content/index.html
websites/staging/sis/trunk/content/source.html
Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan 26 11:34:00 2018
@@ -1 +1 @@
-1816226
+1822277
Modified: websites/staging/sis/trunk/content/branches.html
==============================================================================
--- websites/staging/sis/trunk/content/branches.html (original)
+++ websites/staging/sis/trunk/content/branches.html Fri Jan 26 11:34:00 2018
@@ -93,7 +93,7 @@
visibility: hidden;
}
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>The <a href="source.html">source code repository</a> contains JDK7 and JDK8
branches together with the trunk.
+<p>The <a href="source.html">source code repository</a> contains JDK8 and JDK9
branches together with the trunk.
The Apache SIS releases are created from the code on the trunk only.
However the actual development often occur on a branch before to be merged to
the trunk.
Those branches exist in order to experiment early the new technologies â
since it may impact
@@ -103,11 +103,8 @@ for making merges easier, then provides
<div class="toc">
<ul>
<li><a href="#development">The development branches</a><ul>
+<li><a href="#jdk9">branches/JDK8</a></li>
<li><a href="#jdk8">branches/JDK8</a></li>
-<li><a href="#jdk7">branches/JDK7</a><ul>
-<li><a href="#behavior-jdk7">Behavioral differences</a></li>
-</ul>
-</li>
<li><a href="#trunk">trunk</a><ul>
<li><a href="#behavior">Behavioral differences</a></li>
</ul>
@@ -129,38 +126,18 @@ for making merges easier, then provides
</div>
<h1 id="development">The development branches<a class="headerlink"
href="#development" title="Permanent link">¶</a></h1>
<p>Developers are encouraged to select the first branch listed below, in that
order, which meet their needs.</p>
-<h2 id="jdk8">branches/JDK8<a class="headerlink" href="#jdk8" title="Permanent
link">¶</a></h2>
+<h2 id="jdk9">branches/JDK8<a class="headerlink" href="#jdk9" title="Permanent
link">¶</a></h2>
<p>The JDK8 branch is the recommended development branch for developers who
can use a JDK8 environment.
-This branch implements the interfaces defined in the <a
href="http://www.geoapi.org/snapshot/index.html";>GeoAPI snapshot</a> milestones
-and uses some JDK8 or JDK7-specific features like:</p>
-<ul>
-<li>Syntax enhancements, mostly in exception handling
(<em>try-with-resources</em>, <em>multi-catches</em>)
- but also on other aspects like <em>diamond operator</em>.</li>
-<li>Leveraging of new API (<em>suppressed exceptions</em>, <em>file
systems</em>, <em>fork join</em>).</li>
-<li>Functional interfaces and lambda expressions.</li>
-</ul>
-<h2 id="jdk7">branches/JDK7<a class="headerlink" href="#jdk7" title="Permanent
link">¶</a></h2>
-<p>The JDK7 branch is a merge of the JDK8 branch ported to the JDK7 platform.
-The JDK7 branch implements the same GeoAPI interfaces than the JDK8 branch;
+This branch implements the interfaces defined in the <a
href="http://www.geoapi.org/snapshot/index.html";>GeoAPI snapshot</a>
milestones.</p>
+<h2 id="jdk8">branches/JDK8<a class="headerlink" href="#jdk8" title="Permanent
link">¶</a></h2>
+<p>The JDK8 branch is a merge of the JDK9 branch ported to the JDK8 platform.
+The JDK8 branch implements the same GeoAPI interfaces than the JDK9 branch;
the only differences (apart version number) are the modifications necessary
-for building and running on a JDK7 platform:</p>
-<ul>
-<li><em>Lambda expressions</em> replaced by anonymous classes.</li>
-<li>New methods on collection interfaces replaced by calls to static
methods.</li>
-<li><code>java.util.function</code> and <code>java.time</code> API replaced by
internal placeholder classes.</li>
-</ul>
-<h3 id="behavior-jdk7">Behavioral differences<a class="headerlink"
href="#behavior-jdk7" title="Permanent link">¶</a></h3>
-<p>The JDK7 branch should behaves in a way close to identical to the JDK8
branch,
-with possible variations in the following aspects:</p>
-<ul>
-<li>Usage of <code>java.time.format.DateTimeFormatter</code> for parsing and
formatting ISO 8601 dates
- are simulated by usage of <code>java.text.SimpleDateFormat</code>. Those
two formatters may not have
- the same tolerance to inputs that deviate from the standard.</li>
-</ul>
+for building and running on a JDK8 platform.</p>
<h2 id="trunk">trunk<a class="headerlink" href="#trunk" title="Permanent
link">¶</a></h2>
-<p>The trunk is a merge of the JDK7 branch ported to the interfaces defined by
the <a href="http://www.geoapi.org/3.0/index.html";>GeoAPI stable release</a>.
+<p>The trunk is a merge of the JDK8 branch ported to the interfaces defined by
the <a href="http://www.geoapi.org/3.0/index.html";>GeoAPI stable release</a>.
This is the code which is built by the continuous integration system and
deployed on the Maven repository.
-The main differences (apart version number) compared to the JDK7 branch are
the modifications
+The main differences (apart version number) compared to the JDK8 branch are
the modifications
necessary for implementing an older version of the GeoAPI interfaces:</p>
<ul>
<li>
@@ -210,10 +187,10 @@ conflicts with the platform-dependent im
<h2 id="substitutions">Substitution for non-existent classes<a
class="headerlink" href="#substitutions" title="Permanent link">¶</a></h2>
-<p>When using a JDK8 class that does not exist on JDK7, define a class of the
same name in a
+<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
JDK8-dependent
-code from the JDK7 branch.</p>
+provided that it can be done with reasonable effort. Otherwise just delete the
JDK9-dependent
+code from the JDK8 branch.</p>
<h1 id="merges">Performing the merges<a class="headerlink" href="#merges"
title="Permanent link">¶</a></h1>
<p>Subversion 1.5 and later maintain a <code>svn:mergeinfo</code> property
which make merge operations much easier.
In order to get those merge information properly maintained, no merge
operation shall be performed
@@ -222,20 +199,20 @@ with older Subversion tools.</p>
<p>The branches and trunk checkout directories can be located anywhere on the
developer machine.
The following example assumes that the current directory contains the
following sub-directories:</p>
<ul>
-<li><code>JDK7</code> as a checkout of
<code>http://svn.apache.org/repos/asf/sis/branches/JDK7</code>.</li>
<li><code>JDK8</code> as a checkout of
<code>http://svn.apache.org/repos/asf/sis/branches/JDK8</code>.</li>
+<li><code>JDK9</code> as a checkout of
<code>http://svn.apache.org/repos/asf/sis/branches/JDK9</code>.</li>
</ul>
<p>However the instructions below can be adapted to different directory
locations by changing
the paths given in argument to the <code>cd</code> and <code>svn merge</code>
commands.</p>
-<p>Assuming that the developer wants to merge the changes <em>from</em> the
JDK8 directory <em>to</em> the JDK7 directory,
+<p>Assuming that the developer wants to merge the changes <em>from</em> the
JDK9 directory <em>to</em> the JDK8 directory,
then the following commands can be executed.
Do <strong>not</strong> specify any revision number to the <code>svn
merge</code> command.
Instead, let Subversion infers the proper revisions range from the
<code>svn:mergeinfo</code> property.</p>
-<div class="codehilite"><pre><span class="nb">cd </span>JDK8
+<div class="codehilite"><pre><span class="nb">cd </span>JDK9
svn update
-<span class="nb">cd</span> ../JDK7
+<span class="nb">cd</span> ../JDK8
svn update
-svn merge ../JDK8
+svn merge ../JDK9
</pre></div>
@@ -257,27 +234,27 @@ mvn install
<p>After a successful build, commit:</p>
-<div class="codehilite"><pre>svn commit --message <span class="s2">"Merge
from the JDK8 branch."</span>
+<div class="codehilite"><pre>svn commit --message <span class="s2">"Merge
from the JDK9 branch."</span>
</pre></div>
<h2 id="merge-record-only">Declaring that some changes shall not be merged<a
class="headerlink" href="#merge-record-only" title="Permanent
link">¶</a></h2>
-<p>If a developers wants to apply some changes specific to the JDK8 platform
and tells
-Subversion to not propagate those changes to the JDK7 branch, then the
following
+<p>If a developers wants to apply some changes specific to the JDK9 platform
and tells
+Subversion to not propagate those changes to the JDK8 branch, then the
following
procedure shall be applied:</p>
<ul>
-<li>Before to apply JDK8-specific changes, merge any pending changes to the
JDK7 branch.</li>
-<li>Apply the JDK8-specific changes and commit.</li>
+<li>Before to apply JDK9-specific changes, merge any pending changes to the
JDK8 branch.</li>
+<li>Apply the JDK9-specific changes and commit.</li>
<li>Run the following commands (edit the path arguments if the directory
layout is different
than the example from the previous section):</li>
</ul>
<p>Commands:</p>
-<div class="codehilite"><pre><span class="nb">cd </span>JDK8
+<div class="codehilite"><pre><span class="nb">cd </span>JDK9
svn update
-<span class="nb">cd</span> ../JDK7
+<span class="nb">cd</span> ../JDK8
svn update
-svn merge --record-only ../JDK8
-svn commit --message <span class="s2">"Skip JDK8-specific
changes."</span>
+svn merge --record-only ../JDK9
+svn commit --message <span class="s2">"Skip JDK9-specific
changes."</span>
</pre></div>
</article>
</section>
Modified: websites/staging/sis/trunk/content/build.html
==============================================================================
--- websites/staging/sis/trunk/content/build.html (original)
+++ websites/staging/sis/trunk/content/build.html Fri Jan 26 11:34:00 2018
@@ -215,7 +215,7 @@ This plugin performs a work similar to t
<li>In multi-modules projects, this plugin does not create anything in the
<code>target</code> directory of sub-modules.
Instead, this plugin groups everything in the
<code>target/binaries</code> directory of the parent module.</li>
<li>This plugin does not create any ZIP file. It only links or lists JAR files.
- The JDK7 and above versions of this plugin use hard links on platforms
that support them,
+ This plugin uses hard links on platforms that support them,
so execution of this plugin should be very cheap and consume few disk
space.</li>
<li>Dependencies already present in the <code>target/binaries</code> directory
are presumed stables and
are not overwritten. Only artifacts produced by the Maven build are
unconditionally overwritten.</li>
Modified: websites/staging/sis/trunk/content/index.html
==============================================================================
--- websites/staging/sis/trunk/content/index.html (original)
+++ websites/staging/sis/trunk/content/index.html Fri Jan 26 11:34:00 2018
@@ -150,7 +150,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, JDK7, JDK8.</li>
+<li><a href="branches.html">Branches</a>: trunk, JDK8, JDK9.</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/source.html
==============================================================================
--- websites/staging/sis/trunk/content/source.html (original)
+++ websites/staging/sis/trunk/content/source.html Fri Jan 26 11:34:00 2018
@@ -140,7 +140,7 @@ Those data are currently provided only o
</ul>
</div>
<h1 id="ide">Opening Apache SIS in an IDE<a class="headerlink" href="#ide"
title="Permanent link">¶</a></h1>
-<p>Different SIS branches are available depending on the target platforms
(JDK7 versus JDK8, or GeoAPI versions).
+<p>Different SIS branches are available depending on the target platforms
(JDK8 versus JDK9, or GeoAPI versions).
The alternatives are listed in the <a href="branches.html">branches page</a>.
This section documents how to checkout the trunk for development with
Subversion,
but the same instructions should work for any branch or for Git.</p>
