sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r998483 - in /websites/staging/sis/trunk/content: ./ branches.html index.html release-management.html source.html
Date Wed, 28 Sep 2016 13:55:49 GMT
Author: buildbot
Date: Wed Sep 28 13:55:49 2016
New Revision: 998483

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/index.html
    websites/staging/sis/trunk/content/release-management.html
    websites/staging/sis/trunk/content/source.html

Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Sep 28 13:55:49 2016
@@ -1 +1 @@
-1762666
+1762667

Modified: websites/staging/sis/trunk/content/branches.html
==============================================================================
--- websites/staging/sis/trunk/content/branches.html (original)
+++ websites/staging/sis/trunk/content/branches.html Wed Sep 28 13:55:49 2016
@@ -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 JDK6,
JDK7 and JDK8 branches together with the trunk.
+<p>The <a href="source.html">source code repository</a> contains JDK7 and
JDK8 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
@@ -108,10 +108,6 @@ for making merges easier, then provides
 <li><a href="#behavior-jdk7">Behavioral differences</a></li>
 </ul>
 </li>
-<li><a href="#jdk6">branches/JDK6</a><ul>
-<li><a href="#behavior-jdk6">Behavioral differences</a></li>
-</ul>
-</li>
 <li><a href="#trunk">trunk</a><ul>
 <li><a href="#behavior">Behavioral differences</a></li>
 </ul>
@@ -161,44 +157,10 @@ with possible variations in the followin
     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>
-<h2 id="jdk6">branches/JDK6<a class="headerlink" href="#jdk6" title="Permanent link">&para;</a></h2>
-<p>The JDK6 branch is a merge of the JDK7 branch ported to the JDK6 platform.
-The JDK6 branch implements the same GeoAPI interfaces than the JDK7 branch;
-the only differences (apart version number) are the modifications necessary
-for building and running on a JDK6 platform:</p>
-<ul>
-<li><em>Try-with-resources</em> statements replaced by <em>try-finally</em>
statements.</li>
-<li><em>Multi-catches</em> replaced by an explicit sequences of <em>catch</em>
statements.</li>
-<li><em>Diamond operators</em> replaced by explicit generic types.</li>
-<li><em>Suppressed exceptions</em> removed.</li>
-<li>Exception types introduced after JDK6 (e.g. <code>java.util.IllformedLocaleException</code>)
replaced by their nearest parent (may be <code>RuntimeException</code>).</li>
-<li>Imports of <code>java.util.Objects</code> replaced by imports of <code>org.apache.sis.internal.util.Objects</code>.</li>
-<li>Other JDK7-specific features resolved on a case-by-case basis.</li>
-</ul>
-<h3 id="behavior-jdk6">Behavioral differences<a class="headerlink" href="#behavior-jdk6"
title="Permanent link">&para;</a></h3>
-<p>Some JDK7-specific features are reproduced on the JDK6 branch in an approximative
way,
-which may cause some differences in application behavior (ignoring differences in performance).
-Most differences are about the JDK7 branch being slightly stricter than the JDK6 branch is,
-or being able to handle information that are unsupported on the JDK6 branch.</p>
-<ul>
-<li>
-<p>Invalid language strings accepted by the JDK6 branch may be rejected by the JDK7
branch, for example "<code>en_US_WIN</code>".
-    Conversely the JDK7 branch accepts IETF BCP 47 language tag strings (for example "<code>en-US-x-lvariant-POSIX</code>")
while
-    the JDK6 branch does not. This is because the JDK7 branch creates <code>java.util.Locale</code>
instances using <code>Locale.Builder</code>
-    while the JDK6 branch uses <code>Locale</code> constructor, and the former
performs more rigorous syntax checks than the later.
-    In the above example, "<code>WIN</code>" is not a valid locale variant.</p>
-</li>
-<li>
-<p>Some exceptions that would be propagated on the JDK7 branch are caught on the JDK6
branch.
-    This is because some verbose <em>multi-catches</em> are replaced by a single
catch of a broad type like <code>Exception</code>.
-    Since uncaught exceptions on JDK7 branch were expected to be bugs, the broad exception
handling on JDK6 branch
-    may make some potential SIS bugs slightly more difficult to identify.</p>
-</li>
-</ul>
 <h2 id="trunk">trunk<a class="headerlink" href="#trunk" title="Permanent link">&para;</a></h2>
-<p>The trunk is a merge of the JDK6 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 JDK7 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 JDK6 branch are the modifications
+The main differences (apart version number) compared to the JDK7 branch are the modifications
 necessary for implementing an older version of the GeoAPI interfaces:</p>
 <ul>
 <li>
@@ -234,36 +196,6 @@ whether the MBeans documented in the <co
 <li>or the modified lines are known to be identical on all active branches (merges
work well in such cases);</li>
 <li>or the committer is willing to resolve the merge conflicts.</li>
 </ul>
-<p>In particular, if a block merged from the JDK7 branch must be changed in the JDK6
branch
-because of language changes, try to replace it by a block construct using the same indentation.
-For example the following JDK7 construct:</p>
-<div class="codehilite"><pre><span class="k">switch</span> <span
class="o">(</span><span class="n">string</span><span class="o">)</span>
<span class="o">{</span>
-    <span class="k">case</span> <span class="s">&quot;ABC&quot;</span><span
class="o">:</span> <span class="o">{</span>
-        <span class="n">invokeABC</span><span class="o">();</span>
-        <span class="k">break</span><span class="o">;</span>
-    <span class="o">}</span>
-    <span class="k">case</span> <span class="s">&quot;DEF&quot;</span><span
class="o">:</span> <span class="o">{</span>
-        <span class="n">invokeDEF</span><span class="o">();</span>
-        <span class="k">break</span><span class="o">;</span>
-    <span class="o">}</span>
-<span class="o">}</span>
-</pre></div>
-
-
-<p>can be replaced by the code below. The outer <code>{…}</code> would
normally not be needed
-and the <code>else</code> statement would normally follow the previous <code>}</code>,
however in
-this example we aim to preserve the indentation of the <code>case</code> bodies.</p>
-<div class="codehilite"><pre><span class="o">{</span> <span class="c1">//
This is a switch(String) on the JDK7 branch</span>
-    <span class="k">if</span> <span class="o">(</span><span class="n">string</span><span
class="o">.</span><span class="na">equals</span><span class="o">(</span><span
class="s">&quot;ABC&quot;</span><span class="o">))</span> <span
class="o">{</span>
-        <span class="n">invokeABC</span><span class="o">();</span>
-    <span class="o">}</span>
-    <span class="k">else</span> <span class="nf">if</span> <span
class="o">(</span><span class="n">string</span><span class="o">.</span><span
class="na">equals</span><span class="o">(</span><span class="s">&quot;DEF&quot;</span><span
class="o">))</span> <span class="o">{</span>
-        <span class="n">invokeDEF</span><span class="o">();</span>
-    <span class="o">}</span>
-<span class="o">}</span>
-</pre></div>
-
-
 <h2 id="imports">Import statements<a class="headerlink" href="#imports" title="Permanent
link">&para;</a></h2>
 <p>Isolate at the end of the imports section any import statements that are specific
to a platform.
 This separation allows any branch to re-arrange the common import statements without generating
@@ -272,16 +204,16 @@ conflicts with the platform-dependent im
 <span class="kn">import</span> <span class="nn">java.util.List</span><span
class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.sis.util.ArgumentChecks</span><span
class="o">;</span>
 
-<span class="c1">// Related to JDK7</span>
-<span class="kn">import</span> <span class="nn">java.util.Objects</span><span
class="o">;</span>
+<span class="c1">// Branch-specific imports</span>
+<span class="kn">import</span> <span class="nn">java.util.stream.Stream</span><span
class="o">;</span>
 </pre></div>
 
 
 <h2 id="substitutions">Substitution for non-existent classes<a class="headerlink"
href="#substitutions" title="Permanent link">&para;</a></h2>
-<p>When using a JDK7 class that does not exist on JDK6, define a class of the same
name in a
+<p>When using a JDK8 class that does not exist on JDK7, 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 JDK7-dependent
-code from the JDK6 branch.</p>
+provided that it can be done with reasonable effort. Otherwise just delete the JDK8-dependent
+code from the JDK7 branch.</p>
 <h1 id="merges">Performing the merges<a class="headerlink" href="#merges" title="Permanent
link">&para;</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
@@ -290,20 +222,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>JDK6</code> as a checkout of <code>http://svn.apache.org/repos/asf/sis/branches/JDK6</code>.</li>
 <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>
 </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 JDK7 directory <em>to</em> the JDK6 directory,
+<p>Assuming that the developer wants to merge the changes <em>from</em>
the JDK8 directory <em>to</em> the JDK7 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>JDK7
+<div class="codehilite"><pre><span class="nb">cd </span>JDK8
 svn update
-<span class="nb">cd</span> ../JDK6
+<span class="nb">cd</span> ../JDK7
 svn update
-svn merge ../JDK7
+svn merge ../JDK8
 </pre></div>
 
 
@@ -325,27 +257,27 @@ mvn install
 
 
 <p>After a successful build, commit:</p>
-<div class="codehilite"><pre>svn commit --message <span class="s2">&quot;Merge
from the JDK6 branch.&quot;</span>
+<div class="codehilite"><pre>svn commit --message <span class="s2">&quot;Merge
from the JDK8 branch.&quot;</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">&para;</a></h2>
-<p>If a developers wants to apply some changes specific to the JDK7 platform and tells
-Subversion to not propagate those changes to the JDK6 branch, then the following
+<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
 procedure shall be applied:</p>
 <ul>
-<li>Before to apply JDK7-specific changes, merge any pending changes to the JDK6 branch.</li>
-<li>Apply the JDK7-specific changes and commit.</li>
+<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>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>JDK7
+<div class="codehilite"><pre><span class="nb">cd </span>JDK8
 svn update
-<span class="nb">cd</span> ../JDK6
+<span class="nb">cd</span> ../JDK7
 svn update
-svn merge --record-only ../JDK7
-svn commit --message <span class="s2">&quot;Skip JDK7-specific changes.&quot;</span>
+svn merge --record-only ../JDK8
+svn commit --message <span class="s2">&quot;Skip JDK8-specific changes.&quot;</span>
 </pre></div>
             </article>
           </section>

Modified: websites/staging/sis/trunk/content/index.html
==============================================================================
--- websites/staging/sis/trunk/content/index.html (original)
+++ websites/staging/sis/trunk/content/index.html Wed Sep 28 13:55:49 2016
@@ -139,7 +139,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, JDK6, JDK7, JDK8.</li>
+<li><a href="branches.html">Branches</a>: trunk, JDK7, JDK8.</li>
 <li><a href="http://issues.apache.org/jira/browse/SIS">Issue tracking</a>:
JIRA.</li>
 <li><a href="http://reviews.apache.org/groups/sis">Code review</a></li>
 <li><a href="release-management.html">Release management</a> (for release
managers)</li>

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 28 13:55:49 2016
@@ -157,7 +157,7 @@ the current release attempt. Those versi
 <span class="nb">export </span><span class="nv">NEW_VERSION</span><span
class="o">=</span>0.8
 <span class="nb">export </span><span class="nv">RELEASE_CANDIDATE</span><span
class="o">=</span>1
 <span class="nb">export </span><span class="nv">SIGNING_KEY</span><span
class="o">=</span>&lt;your key ID&gt;
-<span class="nb">export </span><span class="nv">BOOTCLASSPATH</span><span
class="o">=</span>&lt;path to the rt.jar file of a JDK6 installation&gt;
+<span class="nb">export </span><span class="nv">BOOTCLASSPATH</span><span
class="o">=</span>&lt;path to the rt.jar file of a JDK7 installation&gt;
 </pre></div>
 
 
@@ -190,9 +190,9 @@ in this page shall be adjusted according
 
 
 <h2 id="java-update">Java updates<a class="headerlink" href="#java-update" title="Permanent
link">&para;</a></h2>
-<p>While we need a JDK6 installation for the <code>bootclasspath</code>
option, we do not recommend to use it for generating
-the binaries since JDK6 has reached its end of public updates (but not the end of commercial
support).
-We recommend to create the release with JDK7 instead (JDK8 <code>javadoc</code>
tool seems to have a bug that prevent its use with SIS).
+<p>While we need a JDK7 installation for the <code>bootclasspath</code>
option, we do not recommend to use it for generating
+the binaries since JDK7 has reached its end of public updates (but not the end of commercial
support).
+We recommend to create the release with JDK8 instead (note however than JDK8 <code>javadoc</code>
tool seems to have a bug that prevent its use with SIS).
 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<a class="headerlink" href="#prepare-source"
title="Permanent link">&para;</a></h1>
@@ -200,7 +200,7 @@ For example the <code>javadoc</code> too
 <ul>
 <li>Review and update the <code>README</code> file on the <code>trunk</code>
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>Ensure that the <code>trunk</code> build is successful (including tests)
with JDK6, JDK7 and JDK8.</li>
+<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>
@@ -678,7 +678,7 @@ mvn release:update-versions --define <sp
 </pre></div>
 
 
-<p>This change will need to be merged manually on the JDK7, JDK6 branches and on the
trunk.
+<p>This change will need to be merged manually on the JDK7 branch and on the trunk.
 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>

Modified: websites/staging/sis/trunk/content/source.html
==============================================================================
--- websites/staging/sis/trunk/content/source.html (original)
+++ websites/staging/sis/trunk/content/source.html Wed Sep 28 13:55:49 2016
@@ -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">&para;</a></h1>
-<p>Different SIS branches are available depending on the target platforms (JDK6 versus
JDK7 or JDK8, or GeoAPI versions).
+<p>Different SIS branches are available depending on the target platforms (JDK7 versus
JDK8, 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>



Mime
View raw message