Author: buildbot
Date: Fri Jun 22 09:06:05 2018
New Revision: 1031593
Log:
Staging update by buildbot for sis
Modified:
websites/staging/sis/trunk/content/ (props changed)
websites/staging/sis/trunk/content/branches.html
Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun 22 09:06:05 2018
@@ -1 +1 @@
-1833905
+1834085
Modified: websites/staging/sis/trunk/content/branches.html
==============================================================================
--- websites/staging/sis/trunk/content/branches.html (original)
+++ websites/staging/sis/trunk/content/branches.html Fri Jun 22 09:06:05 2018
@@ -110,7 +110,8 @@ for making merges easier.</p>
<li><a href="#development">The development branches</a><ul>
<li><a href="#geoapi-4.0">GeoAPI 4.0 branch</a></li>
<li><a href="#geoapi-3.1">GeoAPI 3.1 branch</a></li>
-<li><a href="#master">master</a><ul>
+<li><a href="#master">Master</a><ul>
+<li><a href="#differences">Code differences</a></li>
<li><a href="#behavior">Behavioral differences</a></li>
</ul>
</li>
@@ -142,22 +143,15 @@ It has the same content that the <code>g
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 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">¶</a></h2>
+<h2 id="master">Master<a class="headerlink" href="#master" title="Permanent
link">¶</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>.
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 above-cited branches
are the modifications
-necessary for implementing an older version of the GeoAPI interfaces:</p>
-<ul>
-<li>
-<p>Usages of non-existent GeoAPI interfaces are replaced by direct usages of
the
- corresponding Apache SIS implementation.</p>
-</li>
-<li>
-<p>When a new revision of a standard is available,
- the master still uses the old version since the new revision is not
available in GeoAPI 3.0.
- Sometime it results in usage of methods that are deprecated on the SIS
development branches.</p>
-</li>
-</ul>
+<strong>Git <code>push --force</code> are not allowed on this branch. Commits
on <code>master</code> can not be removed.</strong>
+Commits should be pushed on the development branch first, so they can be
rearranged if needed before merge to <code>master</code>.</p>
+<h3 id="differences">Code differences<a class="headerlink" href="#differences"
title="Permanent link">¶</a></h3>
+<p>The main differences (apart version number) between <code>master</code> and
<code>geoapi</code> branches
+are the modifications necessary for implementing an older version of the
GeoAPI interfaces.
+In particular, usages of non-released GeoAPI interfaces may be replaced by
direct usages of the corresponding Apache SIS implementation.</p>
<p>For security reasons and for avoiding misleading information, the following
functionalities are disabled on master
(but are still enabled on branches as experimental features). In particular
the <code>Supervisor.ENABLED</code> flag controls
whether the MBeans documented in the <code>org.apache.sis.console</code>
package are enabled or not.</p>
