sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1657931 - in /sis/branches/JDK7: ./ application/ application/sis-console/ application/sis-console/src/main/artifact/ application/sis-javafx/ application/sis-webapp/ core/ core/sis-build-helper/ core/sis-feature/ core/sis-metadata/ core/sis...
Date Fri, 06 Feb 2015 19:37:46 GMT
Author: desruisseaux
Date: Fri Feb  6 19:37:45 2015
New Revision: 1657931

URL: http://svn.apache.org/r1657931
Log:
Merge the version number upgrade from JDK8 branch.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/application/pom.xml
    sis/branches/JDK7/application/sis-console/pom.xml
    sis/branches/JDK7/application/sis-console/src/main/artifact/README
    sis/branches/JDK7/application/sis-javafx/pom.xml
    sis/branches/JDK7/application/sis-webapp/pom.xml
    sis/branches/JDK7/core/pom.xml
    sis/branches/JDK7/core/sis-build-helper/pom.xml
    sis/branches/JDK7/core/sis-feature/pom.xml
    sis/branches/JDK7/core/sis-metadata/pom.xml
    sis/branches/JDK7/core/sis-referencing/pom.xml
    sis/branches/JDK7/core/sis-utility/pom.xml
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
    sis/branches/JDK7/pom.xml
    sis/branches/JDK7/profiles/pom.xml
    sis/branches/JDK7/profiles/sis-french-profile/pom.xml
    sis/branches/JDK7/storage/pom.xml
    sis/branches/JDK7/storage/sis-netcdf/pom.xml
    sis/branches/JDK7/storage/sis-shapefile/pom.xml
    sis/branches/JDK7/storage/sis-storage/pom.xml

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  6 19:37:45 2015
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1657634
+/sis/branches/JDK8:1584960-1657929
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/application/pom.xml (original)
+++ sis/branches/JDK7/application/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/application/sis-console/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/pom.xml (original)
+++ sis/branches/JDK7/application/sis-console/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>application</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/application/sis-console/src/main/artifact/README
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/artifact/README?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/artifact/README [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/artifact/README [UTF-8] Fri Feb  6
19:37:45 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/branches/JDK7/application/sis-javafx/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-javafx/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-javafx/pom.xml (original)
+++ sis/branches/JDK7/application/sis-javafx/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>application</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK7/application/sis-webapp/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>application</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.sis.application</groupId>

Modified: sis/branches/JDK7/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/core/pom.xml (original)
+++ sis/branches/JDK7/core/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/core/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK7/core/sis-build-helper/pom.xml Fri Feb  6 19:37:45 2015
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: sis/branches/JDK7/core/sis-feature/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/pom.xml (original)
+++ sis/branches/JDK7/core/sis-feature/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/pom.xml (original)
+++ sis/branches/JDK7/core/sis-metadata/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/pom.xml (original)
+++ sis/branches/JDK7/core/sis-referencing/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.sis.core</groupId>

Modified: sis/branches/JDK7/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/pom.xml (original)
+++ sis/branches/JDK7/core/sis-utility/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
[UTF-8] Fri Feb  6 19:37:45 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/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Fri Feb  6 19:37:45 2015
@@ -39,7 +39,7 @@
        ============================================================== -->
   <groupId>org.apache.sis</groupId>
   <artifactId>parent</artifactId>
-  <version>0.5-jdk7-SNAPSHOT</version>
+  <version>0.6-jdk7-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache SIS</name>

Modified: sis/branches/JDK7/profiles/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/pom.xml (original)
+++ sis/branches/JDK7/profiles/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/profiles/sis-french-profile/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/pom.xml (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>profiles</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/storage/pom.xml (original)
+++ sis/branches/JDK7/storage/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK7/storage/sis-netcdf/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/storage/sis-shapefile/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-shapefile/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-shapefile/pom.xml (original)
+++ sis/branches/JDK7/storage/sis-shapefile/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK7/storage/sis-storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/pom.xml?rev=1657931&r1=1657930&r2=1657931&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/pom.xml (original)
+++ sis/branches/JDK7/storage/sis-storage/pom.xml Fri Feb  6 19:37:45 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.5-jdk7-SNAPSHOT</version>
+    <version>0.6-jdk7-SNAPSHOT</version>
   </parent>
 
 



Mime
View raw message