sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1584494 - in /sis/trunk: ./ application/ application/sis-console/ application/sis-webapp/ core/ core/sis-build-helper/ core/sis-feature/ core/sis-metadata/ core/sis-referencing/ core/sis-utility/ core/sis-utility/src/main/java/org/apache/s...
Date Fri, 04 Apr 2014 01:18:47 GMT
Author: desruisseaux
Date: Fri Apr  4 01:18:46 2014
New Revision: 1584494

URL: http://svn.apache.org/r1584494
Log:
Merge and adapt the version number update from the JDK6 branch.

Modified:
    sis/trunk/   (props changed)
    sis/trunk/application/pom.xml
    sis/trunk/application/sis-console/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   (contents, props changed)
    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/util/Version.java
    sis/trunk/pom.xml
    sis/trunk/profiles/pom.xml
    sis/trunk/profiles/sis-french-profile/pom.xml
    sis/trunk/src/main/docbook/book.entities
    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/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1584482-1584488
  Merged /sis/branches/JDK6:r1584483-1584491

Modified: sis/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/application/pom.xml?rev=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/application/pom.xml (original)
+++ sis/trunk/application/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/application/sis-console/pom.xml (original)
+++ sis/trunk/application/sis-console/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>application</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/application/sis-webapp/pom.xml (original)
+++ sis/trunk/application/sis-webapp/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>application</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/core/pom.xml (original)
+++ sis/trunk/core/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/pom.xml (original)
+++ sis/trunk/core/sis-build-helper/pom.xml Fri Apr  4 01:18:46 2014
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/pom.xml (original)
+++ sis/trunk/core/sis-feature/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
 
 

Propchange: sis/trunk/core/sis-feature/pom.xml
------------------------------------------------------------------------------
  Merged /sis/branches/JDK6/core/sis-feature/pom.xml:r1584483-1584491
  Merged /sis/branches/JDK7/core/sis-feature/pom.xml:r1584482-1584488

Modified: sis/trunk/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/pom.xml?rev=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/pom.xml (original)
+++ sis/trunk/core/sis-metadata/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/pom.xml (original)
+++ sis/trunk/core/sis-referencing/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/pom.xml (original)
+++ sis/trunk/core/sis-utility/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Version.java?rev=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8] Fri
Apr  4 01:18:46 2014
@@ -57,7 +57,7 @@ public class Version implements CharSequ
     /**
      * The version of this Apache SIS distribution.
      */
-    public static final Version SIS = new Version("0.4-SNAPSHOT");
+    public static final Version SIS = new Version("0.5-SNAPSHOT");
 
     /**
      * A few commonly used version numbers. This list is based on SIS needs, e.g. in {@code
DataStore}

Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Fri Apr  4 01:18:46 2014
@@ -39,7 +39,7 @@
        ============================================================== -->
   <groupId>org.apache.sis</groupId>
   <artifactId>parent</artifactId>
-  <version>0.4-SNAPSHOT</version>
+  <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/profiles/pom.xml (original)
+++ sis/trunk/profiles/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/profiles/sis-french-profile/pom.xml (original)
+++ sis/trunk/profiles/sis-french-profile/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>profiles</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/trunk/src/main/docbook/book.entities
URL: http://svn.apache.org/viewvc/sis/trunk/src/main/docbook/book.entities?rev=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/src/main/docbook/book.entities (original)
+++ sis/trunk/src/main/docbook/book.entities Fri Apr  4 01:18:46 2014
@@ -1,6 +1,6 @@
 <!ENTITY geoapi-version "3.0.0">
 <!ENTITY geoapi-release "3.0.0">
-<!ENTITY sis-release    "0.4-SNAPSHOT">
+<!ENTITY sis-release    "0.5-SNAPSHOT">
 <!ENTITY gml-version    "3.3">
 <!ENTITY sis-javadoc    "../apidocs">
 <!ENTITY geoapi-javadoc "http://www.geoapi.org/3.0/javadoc">

Modified: sis/trunk/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/storage/pom.xml?rev=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/storage/pom.xml (original)
+++ sis/trunk/storage/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/pom.xml (original)
+++ sis/trunk/storage/sis-netcdf/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/storage/sis-shapefile/pom.xml (original)
+++ sis/trunk/storage/sis-shapefile/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-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=1584494&r1=1584493&r2=1584494&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/pom.xml (original)
+++ sis/trunk/storage/sis-storage/pom.xml Fri Apr  4 01:18:46 2014
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
 
 



Mime
View raw message