svn commit: r1656951 - in /sis: branches/JDK8/pom.xml branches/JDK8/src/main/rdf/ site/trunk/content/release-management.mdtext

[de...@apache.org]

Author: desruisseaux
Date: Tue Feb  3 23:35:35 2015
New Revision: 1656951

URL: http://svn.apache.org/r1656951
Log:
Updates identified as a side-effect of preparing the 0.5 release.

Removed:
    sis/branches/JDK8/src/main/rdf/
Modified:
    sis/branches/JDK8/pom.xml
    sis/site/trunk/content/release-management.mdtext

Modified: sis/branches/JDK8/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/pom.xml?rev=1656951&r1=1656950&r2=1656951&view=diff
==============================================================================
--- sis/branches/JDK8/pom.xml (original)
+++ sis/branches/JDK8/pom.xml Tue Feb  3 23:35:35 2015
@@ -403,7 +403,6 @@ Apache SIS is a free software, Java lang
        =================================================================== -->
   <properties>
     <netcdf.version>4.5.3</netcdf.version>
-    <findbugs.version>2.5.3</findbugs.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <website.encoding>UTF-8</website.encoding>
     <website.locale>en</website.locale>
@@ -677,15 +676,11 @@ Apache SIS is a free software, Java lang
         </configuration>
       </plugin>
 
-      <!-- Dependencies requires for the SIS FindBugs configuration file.
-           This dependency should be declared in the <reporting> section,
-           but Maven 3.0.4 does not support dependency declaration there.
-           Note that the version number is duplicated in the <reporting>
-           section, because <reporting> ignores <pluginManagement>. -->
+      <!-- Dependencies requires for the SIS FindBugs configuration file. -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>${findbugs.version}</version>
+        <version>2.5.3</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.sis.core</groupId>

Modified: sis/site/trunk/content/release-management.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/release-management.mdtext?rev=1656951&r1=1656950&r2=1656951&view=diff
==============================================================================
--- sis/site/trunk/content/release-management.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/release-management.mdtext [UTF-8] Tue Feb  3 23:35:35 2015
@@ -152,15 +152,7 @@ but also in a few Java files. The follow
 
 Open the root `pom.xml` file in an editor and perform the following changes:
 
-  * Copy-and-paste the whole `<plugin>` block, except `<reportSets>`, for `maven-javadoc-plugin` from `<reporting>` to `<build>`.
-    We need the javadoc configuration to be duplicated in both `<reporting>` and `<build>` sections in order
-    to get the expected Javadoc output in both Maven site and in the `*-javadoc.jar` files to deployed in the
-    Maven repository. **TODO:** see if upgrading Maven or the `maven-javadoc-plugin` can solve this problem.
-  * Remove the whole `<pluginRepositories>` block, since it should not be needed for releases (and is actually not allowed).
-  * Remove the `<plugin>` block for `docbkx-maven-plugin`, since the DocBook directory is omitted (see below).
-
-Recursively delete the `src/main/docbook` directory (this policy may be revised in future SIS releases).
-We omit this directory for now because this material may move to the CMS, and no English version is available yet.
+  * Remove the whole `<pluginRepositories>` block (including comment), since it should not be needed for releases (and is actually not allowed).
 
 In `core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java`, consider setting
 the `ENABLED` flag to `false`. This policy may be revised in future SIS releases.
@@ -580,13 +572,17 @@ Announce the release    {#announce}
 Update trunk for the next development cycle    {#next-release}
 ==============================================================
 
-Update the version numbers in the `pom.xml` files on trunk with the following command:
+On the development branch (usually JDK8),
+update the version numbers in the `pom.xml` files on trunk with the following command:
 
     :::bash
     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, JDK7 and JDK8 branches.
+This change will need to be merged manually on the JDK7, JDK6 branches and on the trunk.
+Then on the development branch:
+
+  * Edit the version number in the `application/sis-console/src/main/artifact/README` file.
+  * Edit the value of the `MAJOR_VERSION` constant in the `core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java` file.