Author: desruisseaux
Date: Mon May 7 08:27:39 2018
New Revision: 1831081
URL: http://svn.apache.org/viewvc?rev=1831081&view=rev
Log:
Update build instructions.
Modified:
sis/site/trunk/content/branches.mdtext
sis/site/trunk/content/source.mdtext
Modified: sis/site/trunk/content/branches.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/branches.mdtext?rev=1831081&r1=1831080&r2=1831081&view=diff
==============================================================================
--- sis/site/trunk/content/branches.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/branches.mdtext [UTF-8] Mon May 7 08:27:39 2018
@@ -33,25 +33,26 @@ for making merges easier, then provides
The development branches {#development}
==========================================
-Developers are encouraged to select the first branch listed below, in that
order, which meet their needs.
+Users who want stability are encouraged to build from the trunk.
+Developers who want to contribute to Apache SIS are encouraged to use the JDK8
branch for now.
+We plan to switch SIS development to the JDK9 branch later, but the schedule
is not yet determined.
-branches/JDK8 {#jdk9}
+branches/JDK9 {#jdk9}
------------------------
-The JDK8 branch is the recommended development branch for developers who can
use a JDK8 environment.
-This branch implements the interfaces defined in the [GeoAPI
snapshot][geoapi-snapshot] milestones.
+The JDK9 branch is an experimental branch for migration to Jigsaw modules.
+It may become the main SIS development branch later, but the schedule is not
yet determined.
branches/JDK8 {#jdk8}
------------------------
-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 JDK8 platform.
+The JDK8 branch is the recommended development branch for now.
+This branch implements the interfaces defined in the [GeoAPI
snapshot][geoapi-snapshot] milestones.
+The JDK8 branch implements the same GeoAPI interfaces than the JDK9 branch.
@@ -117,10 +118,10 @@ conflicts with the platform-dependent im
:::java
import java.io.File;
import java.util.List;
- import org.apache.sis.util.ArgumentChecks;
+ import org.opengis.metadata.Metadata;
// Branch-specific imports
- import java.util.stream.Stream;
+ import org.opengis.feature.Feature;
Modified: sis/site/trunk/content/source.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/source.mdtext?rev=1831081&r1=1831080&r2=1831081&view=diff
==============================================================================
--- sis/site/trunk/content/source.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/source.mdtext [UTF-8] Mon May 7 08:27:39 2018
@@ -47,8 +47,12 @@ Opening Apache SIS in an IDE {#ide}
Different SIS branches are available depending on the target platforms (JDK8
versus JDK9, or GeoAPI versions).
The alternatives are listed in the [branches page](branches.html).
-This section documents how to checkout the trunk for development with
Subversion,
-but the same instructions should work for any branch or for Git.
+One thing to take in consideration can be summarized as below:
+
+ * There is no need to build GeoAPI prior working on SIS trunk.
+ * When working on a SIS development branch, we recommend to build GeoAPI
4.0-SNAPSHOT locally first.
+
+This section documents how to checkout the trunk for development with
Subversion.
While the primarily SIS build system is Maven, the project provides some IDE
configuration files for developers convenience.
Before opening the project in an IDE, the source code needs to be downloaded
from the source repository
