Author: desruisseaux Date: Fri Feb 6 19:50:29 2015 New Revision: 1657939 URL: http://svn.apache.org/r1657939 Log: Merge version number upgrade from JDK6 branch.
Modified: sis/trunk/ (props changed) sis/trunk/application/pom.xml sis/trunk/application/sis-console/pom.xml sis/trunk/application/sis-console/src/main/artifact/README sis/trunk/application/sis-javafx/pom.xml sis/trunk/application/sis-webapp/pom.xml sis/trunk/core/pom.xml sis/trunk/core/sis-build-helper/pom.xml sis/trunk/core/sis-feature/pom.xml sis/trunk/core/sis-metadata/pom.xml sis/trunk/core/sis-referencing/pom.xml sis/trunk/core/sis-utility/pom.xml sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java sis/trunk/pom.xml sis/trunk/profiles/pom.xml sis/trunk/profiles/sis-french-profile/pom.xml sis/trunk/storage/pom.xml sis/trunk/storage/sis-netcdf/pom.xml sis/trunk/storage/sis-shapefile/pom.xml sis/trunk/storage/sis-storage/pom.xml Propchange: sis/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 6 19:50:29 2015 @@ -1,4 +1,4 @@ /sis/branches/Android:1430670-1480699 -/sis/branches/JDK6:1394364-1657639 -/sis/branches/JDK7:1394913-1657637 -/sis/branches/JDK8:1584960-1657634 +/sis/branches/JDK6:1394364-1657935 +/sis/branches/JDK7:1394913-1657931 +/sis/branches/JDK8:1584960-1657929 Modified: sis/trunk/application/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/application/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/application/pom.xml (original) +++ sis/trunk/application/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/application/sis-console/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/application/sis-console/pom.xml (original) +++ sis/trunk/application/sis-console/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>application</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/application/sis-console/src/main/artifact/README URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/artifact/README?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/application/sis-console/src/main/artifact/README [UTF-8] (original) +++ sis/trunk/application/sis-console/src/main/artifact/README [UTF-8] Fri Feb 6 19:50:29 2015 @@ -17,8 +17,8 @@ SIS is based on Java 6 and provided as a Unix ---- -1) Unzip 'apache-sis-0.5-bin.zip' in any directory. -2) Add the 'apache-sis-0.5/bin' directory to the path. +1) Unzip 'apache-sis-0.6-bin.zip' in any directory. +2) Add the 'apache-sis-0.6/bin' directory to the path. 3) Invoke 'sis' on the command line. Windows @@ -26,8 +26,8 @@ Windows There is not yet 'sis.bat' file for Windows. The following steps need to be done manually: -1) Unzip 'apache-sis-0.5-bin.zip' in any directory. -2) In the 'apache-sis-0.5/lib' directory, execute: +1) Unzip 'apache-sis-0.6-bin.zip' in any directory. +2) In the 'apache-sis-0.6/lib' directory, execute: unpack200 --remove-pack-file sis.pack.gz sis.jar Modified: sis/trunk/application/sis-javafx/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-javafx/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/application/sis-javafx/pom.xml (original) +++ sis/trunk/application/sis-javafx/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>application</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/application/sis-webapp/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-webapp/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/application/sis-webapp/pom.xml (original) +++ sis/trunk/application/sis-webapp/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>application</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.apache.sis.application</groupId> Modified: sis/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/core/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/core/pom.xml (original) +++ sis/trunk/core/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/core/sis-build-helper/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/core/sis-build-helper/pom.xml (original) +++ sis/trunk/core/sis-build-helper/pom.xml Fri Feb 6 19:50:29 2015 @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: sis/trunk/core/sis-feature/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/core/sis-feature/pom.xml (original) +++ sis/trunk/core/sis-feature/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>core</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/core/sis-metadata/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/pom.xml (original) +++ sis/trunk/core/sis-metadata/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>core</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/core/sis-referencing/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/pom.xml (original) +++ sis/trunk/core/sis-referencing/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>core</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.apache.sis.core</groupId> Modified: sis/trunk/core/sis-utility/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/core/sis-utility/pom.xml (original) +++ sis/trunk/core/sis-utility/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>core</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java [UTF-8] Fri Feb 6 19:50:29 2015 @@ -65,7 +65,7 @@ public final class Modules { * * @see org.apache.sis.util.Version */ - public static final int MINOR_VERSION = 5; + public static final int MINOR_VERSION = 6; /** * Do not allows instantiation of this class. Modified: sis/trunk/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/pom.xml (original) +++ sis/trunk/pom.xml Fri Feb 6 19:50:29 2015 @@ -39,7 +39,7 @@ ============================================================== --> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache SIS</name> Modified: sis/trunk/profiles/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/profiles/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/profiles/pom.xml (original) +++ sis/trunk/profiles/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/profiles/sis-french-profile/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/profiles/sis-french-profile/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/profiles/sis-french-profile/pom.xml (original) +++ sis/trunk/profiles/sis-french-profile/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>profiles</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/storage/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/storage/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/storage/pom.xml (original) +++ sis/trunk/storage/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/storage/sis-netcdf/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/storage/sis-netcdf/pom.xml (original) +++ sis/trunk/storage/sis-netcdf/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>storage</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/storage/sis-shapefile/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-shapefile/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/storage/sis-shapefile/pom.xml (original) +++ sis/trunk/storage/sis-shapefile/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>storage</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> Modified: sis/trunk/storage/sis-storage/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/pom.xml?rev=1657939&r1=1657938&r2=1657939&view=diff ============================================================================== --- sis/trunk/storage/sis-storage/pom.xml (original) +++ sis/trunk/storage/sis-storage/pom.xml Fri Feb 6 19:50:29 2015 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>storage</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent>