Author: buildbot
Date: Thu Apr 21 20:43:03 2016
New Revision: 986279
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/release-management.html
Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr 21 20:43:03 2016
@@ -1 +1 @@
-1733449
+1740407
Modified: websites/staging/sis/trunk/content/branches.html
==============================================================================
--- websites/staging/sis/trunk/content/branches.html (original)
+++ websites/staging/sis/trunk/content/branches.html Thu Apr 21 20:43:03 2016
@@ -133,16 +133,20 @@ and uses some JDK8 or JDK7-specific feat
<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;
the only differences (apart version number) are the modifications necessary
-for building and running on a JDK7 platform.</p>
+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>
<h2 id="jdk6">branches/JDK6<a class="headerlink" href="#jdk6" title="Permanent
link">¶</a></h2>
<p>The JDK6 branch is a merge of the JDK7 branch ported to the JDK6 platform.
-This is the recommended development branch for developers who can not use a
JDK7 environment,
-but still want to work closely with latest GeoAPI interfaces.
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>
@@ -158,12 +162,18 @@ for building and running on a JDK6 platf
<h2 id="trunk">trunk<a class="headerlink" href="#trunk" title="Permanent
link">¶</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>.
This is the code which is built by the continuous integration system and
deployed on the Maven repository.
-The only differences (apart version number) compared to the JDK6 branch are
the modifications
+The main differences (apart version number) compared to the JDK6 branch are
the modifications
necessary for implementing an older version of the GeoAPI interfaces:</p>
<ul>
<li>Usages of non-existent GeoAPI interfaces are replaced by direct usages of
the
corresponding Apache SIS implementation.</li>
</ul>
+<p>For security reasons and for avoiding misleading information, two
functionalities are disabled on trunk:</p>
+<ul>
+<li>In
<code>core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java</code>,
the <code>ENABLED</code> flag is set to <code>false</code>.</li>
+<li>In
<code>core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java</code>,
the <code>REPORT_MISSING_MODULE</code> flag is set to <code>false</code>.</li>
+</ul>
+<p>Above flag values may be changed in future SIS releases.</p>
<h1 id="behavior">Behavioral differences between the branches<a
class="headerlink" href="#behavior" title="Permanent link">¶</a></h1>
<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).
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 Thu Apr 21
20:43:03 2016
@@ -258,14 +258,8 @@ Note that this command does <em>not</em>
<ul>
<li>Remove the whole <code><pluginRepositories></code> block (including
comment), since it should not be needed for releases (and is actually not
allowed).</li>
</ul>
-<p>Consider modifying the following flags (those recommendations may be
revised in future SIS releases):</p>
-<ul>
-<li>In
<code>core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java</code>,
set the <code>ENABLED</code> flag to <code>false</code>.</li>
-<li>In
<code>core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java</code>,
set the <code>REPORT_MISSING_MODULE</code> flag to <code>false</code>.</li>
-</ul>
-<p>Remove the workaround for the bug in JDK6 <code>javadoc</code>, since we
perform release with JDK7 or JDK8.
-Remove also the modules that are not yet ready for a release:</p>
-<div class="codehilite"><pre>svn remove
core/sis-build-helper/src/main/java/org/opengis
+<p>Remove the modules that are not yet ready for a release:</p>
+<div class="codehilite"><pre>svn remove storage/sis-shapefile
svn remove application/sis-javafx
</pre></div>
