sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1622571 - in /sis/site/trunk/content: book/en/developer-guide.html branches.mdtext index.mdtext release-management.mdtext source.mdtext
Date Thu, 04 Sep 2014 22:29:48 GMT
Author: desruisseaux
Date: Thu Sep  4 22:29:48 2014
New Revision: 1622571

URL: http://svn.apache.org/r1622571
Log:
Mention the JDK8 branch, and minor documentation fix.

Modified:
    sis/site/trunk/content/book/en/developer-guide.html
    sis/site/trunk/content/branches.mdtext
    sis/site/trunk/content/index.mdtext
    sis/site/trunk/content/release-management.mdtext
    sis/site/trunk/content/source.mdtext

Modified: sis/site/trunk/content/book/en/developer-guide.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/book/en/developer-guide.html?rev=1622571&r1=1622570&r2=1622571&view=diff
==============================================================================
--- sis/site/trunk/content/book/en/developer-guide.html [UTF-8] (original)
+++ sis/site/trunk/content/book/en/developer-guide.html [UTF-8] Thu Sep  4 22:29:48 2014
@@ -1079,8 +1079,8 @@ System.out.println("The GeoAPI interface
     <em>copy</em> of all interfaces in the <code class="GeoAPI">geoapi</code>
module
     (not a dependence) with additions that have not yet been approved as an <abbr>OGC</abbr>
standard.
     Some additions appear in interfaces normally defined by the <code class="GeoAPI">geoapi</code>
module, hence the need to copy them.
-    <i>Snapshot</i> versions of <code>jdk6</code> branches, and Apache
<abbr>SIS</abbr>'s <code>jdk7</code> and <code>jdk8</code>
depend on this module,
-    but this dependence becomes a dependence on the <code class="GeoAPI">geoapi</code>
standard module when the branches are joined to the trunk.
+    <i>Snapshot</i> versions of Apache <abbr>SIS</abbr>'s <code>jdk6</code>,
<code>jdk7</code> and <code>jdk8</code> branches depend on this module,
+    but this dependence becomes a dependence on the <code class="GeoAPI">geoapi</code>
standard module when the branches are merged to the trunk.
   </p></li>
   <li><p>
     <b><code class="GeoAPI">geoapi-conformance</code></b> — includes
a JUnit test suite that developers may use to test their implementations.

Modified: sis/site/trunk/content/branches.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/branches.mdtext?rev=1622571&r1=1622570&r2=1622571&view=diff
==============================================================================
--- sis/site/trunk/content/branches.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/branches.mdtext [UTF-8] Thu Sep  4 22:29:48 2014
@@ -17,7 +17,7 @@ Notice: Licensed to the Apache Software 
         under the License.
 
 
-The [source code repository](source.html) contains JDK6 and JDK7 branches together with the
trunk.
+The [source code repository](source.html) contains JDK6, 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
@@ -37,12 +37,12 @@ Developers are encouraged to select the 
 
 
 
-branches/JDK7    {#jdk7}
+branches/JDK8    {#jdk8}
 ------------------------
 
-The JDK7 branch is the recommended development branch for developers who can use a JDK7 environment.
+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
-and uses some JDK7-specific features like:
+and uses some JDK8 or JDK7-specific features like:
 
   * Syntax enhancements, mostly in exception handling (_try-with-resources_, _multi-catches_)
     but also on other aspects like _diamond operator_.
@@ -50,6 +50,16 @@ and uses some JDK7-specific features lik
 
 
 
+branches/JDK7    {#jdk7}
+------------------------
+
+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.
+
+
+
 branches/JDK6    {#jdk6}
 ------------------------
 

Modified: sis/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/index.mdtext?rev=1622571&r1=1622570&r2=1622571&view=diff
==============================================================================
--- sis/site/trunk/content/index.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/index.mdtext [UTF-8] Thu Sep  4 22:29:48 2014
@@ -50,7 +50,7 @@ SIS developer documentation    {#develop
 
   * [Source code](source.html): fetching the code, opening in an IDE, developing, formatting.
   * [Build](build.html): build from the source, create the PACK200 file.
-  * [Branches](branches.html): trunk, JDK6, JDK7.
+  * [Branches](branches.html): trunk, JDK6, JDK7, JDK8.
   * [Issue tracking][JIRA]: JIRA.
   * [Code review][review]
   * [Release management](release-management.html) (for release managers)

Modified: sis/site/trunk/content/release-management.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/release-management.mdtext?rev=1622571&r1=1622570&r2=1622571&view=diff
==============================================================================
--- sis/site/trunk/content/release-management.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/release-management.mdtext [UTF-8] Thu Sep  4 22:29:48 2014
@@ -328,14 +328,14 @@ This will also verify the checksums.
 Stage the source, binary and javadoc artifacts    {#stage}
 ==========================================================
 
-Generate the Javadoc. While not mandatory, we suggest to use JDK 7 or above for getting the
new look and feel,
+Generate the Javadoc. While not mandatory, we suggest to use JDK 8 or above for getting the
new look and feel,
 getting the Javadoc enhancements expected in future JDK releases (more dynamic pages),
 avoiding the security vulnerability discovered in the Javadoc tools of older JDK releases,
 and keeping the `diff` smaller on the SVN repository of SIS web site.
-If JDK7 is *not* used, then omit the `cp` command below.
+If JDK8 is *not* used, then omit the `cp` command below.
 
     :::bash
-    cp ../../JDK7/src/main/javadoc/stylesheet.css src/main/javadoc/
+    cp ../../JDK8/src/main/javadoc/stylesheet.css src/main/javadoc/
     mvn site --define skipTests=true
     svn revert src/main/javadoc/stylesheet.css
     cd target/site
@@ -577,7 +577,7 @@ Update the version numbers in the `pom.x
     mvn release:update-versions --define autoVersionSubmodules=true
 
 Edit the version number in the `application/sis-console/src/main/artifact/README` file.
-Report the changes manually on the JDK6 and JDK7 branches.
+Report the changes manually on the JDK6, JDK7 and JDK8 branches.
 
 
 

Modified: sis/site/trunk/content/source.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/source.mdtext?rev=1622571&r1=1622570&r2=1622571&view=diff
==============================================================================
--- sis/site/trunk/content/source.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/source.mdtext [UTF-8] Thu Sep  4 22:29:48 2014
@@ -40,7 +40,7 @@ The remaining of this page provides tips
 Opening Apache SIS in an IDE    {#ide}
 ======================================
 
-Different SIS branches are available depending on the target platforms (JDK6 versus JDK7,
or GeoAPI versions).
+Different SIS branches are available depending on the target platforms (JDK6 versus JDK7
or JDK8, 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.



Mime
View raw message