sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1702543 - in /sis/branches/0.6: ./ core/sis-build-helper/src/main/ant/ core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ core/sis-utility/src/main/java/org/apache/sis/internal/system/ core/sis-utility/src/...
Date Fri, 11 Sep 2015 20:08:03 GMT
Author: desruisseaux
Date: Fri Sep 11 20:08:02 2015
New Revision: 1702543

URL: http://svn.apache.org/r1702543
Log:
Prepare the branch for the 0.6 release.

Modified:
    sis/branches/0.6/core/sis-build-helper/src/main/ant/prepare-release.xml
    sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
    sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
    sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
    sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
    sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
    sis/branches/0.6/pom.xml

Modified: sis/branches/0.6/core/sis-build-helper/src/main/ant/prepare-release.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.6/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1702543&r1=1702542&r2=1702543&view=diff
==============================================================================
--- sis/branches/0.6/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/branches/0.6/core/sis-build-helper/src/main/ant/prepare-release.xml Fri Sep 11 20:08:02
2015
@@ -32,7 +32,7 @@
     <!-- Ensure that the "sis-build-helper" plugin used by the build is the released version.
-->
     <replaceregexp file = "${user.dir}/pom.xml"
                   match = "&lt;sis\.plugin\.version&gt;.+&lt;/sis\.plugin\.version&gt;"
-                replace = "&lt;sis.plugin.version&gt;${sis.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"/>
+                replace = "&lt;sis.plugin.version&gt;${sis.version}&lt;/sis.plugin.version&gt;"/>
 
     <!-- Replace the version number in Java code. -->
     <replaceregexp file = "${user.dir}/core/sis-utility/src/main/java/org/apache/sis/util/Version.java"

Modified: sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java?rev=1702543&r1=1702542&r2=1702543&view=diff
==============================================================================
--- sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
[UTF-8] (original)
+++ sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
[UTF-8] Fri Sep 11 20:08:02 2015
@@ -85,7 +85,7 @@ abstract class ConformalProjection exten
      * Note that since this boolean is static final, the compiler should exclude the code
in the branch that is never
      * executed (no need to comment-out that code).
      */
-    private static final boolean ORIGINAL_FORMULA = false;
+    private static final boolean ORIGINAL_FORMULA = true;
 
     /**
      * Coefficients in the series expansion used by {@link #φ(double)}.

Modified: sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java?rev=1702543&r1=1702542&r2=1702543&view=diff
==============================================================================
--- sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
[UTF-8] (original)
+++ sis/branches/0.6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
[UTF-8] Fri Sep 11 20:08:02 2015
@@ -100,7 +100,7 @@ public class TransverseMercator extends
      * Note that since this boolean is static final, the compiler should exclude the code
in the branch that is never
      * executed (no need to comment-out that code).
      */
-    private static final boolean ORIGINAL_FORMULA = false;
+    private static final boolean ORIGINAL_FORMULA = true;
 
     /**
      * Internal coefficients for computation, depending only on value of excentricity.
@@ -485,6 +485,7 @@ public class TransverseMercator extends
             sin_8ξ = sin(8*ξ);
             cos_8ξ = cos(8*ξ);
 
+            sinh_2η = sinh(2*η);
             cosh_2η = cosh(2*η);
             sinh_4η = sinh(4*η);
             cosh_4η = cosh(4*η);

Modified: sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
URL: http://svn.apache.org/viewvc/sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java?rev=1702543&r1=1702542&r2=1702543&view=diff
==============================================================================
--- sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
[UTF-8] (original)
+++ sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
[UTF-8] Fri Sep 11 20:08:02 2015
@@ -60,7 +60,7 @@ public final class Supervisor extends St
      * Whatever JMX agent is enabled. Setting this variable to {@code false} allows the
      * Java compiler to omit any dependency to this {@code Supervisor} class.
      */
-    static final boolean ENABLED = true;
+    static final boolean ENABLED = false;
 
     /**
      * The JMX object name for the {@code Supervisor} service.

Modified: sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java?rev=1702543&r1=1702542&r2=1702543&view=diff
==============================================================================
--- sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
[UTF-8] (original)
+++ sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
[UTF-8] Fri Sep 11 20:08:02 2015
@@ -43,7 +43,7 @@ public final class TemporalUtilities ext
      *
      * This constant will be removed after SIS release a sis-temporal module.
      */
-    public static final boolean REPORT_MISSING_MODULE = true;
+    public static final boolean REPORT_MISSING_MODULE = false;
 
     /**
      * Do not allow instantiation of this class.

Modified: sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
URL: http://svn.apache.org/viewvc/sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/util/Version.java?rev=1702543&r1=1702542&r2=1702543&view=diff
==============================================================================
--- sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8]
(original)
+++ sis/branches/0.6/core/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8]
Fri Sep 11 20:08:02 2015
@@ -60,7 +60,7 @@ public class Version implements CharSequ
     /**
      * The version of this Apache SIS distribution.
      */
-    public static final Version SIS = new Version(MAJOR_VERSION + "." + MINOR_VERSION + "-SNAPSHOT");
+    public static final Version SIS = new Version(MAJOR_VERSION + "." + MINOR_VERSION);
 
     /**
      * A few commonly used version numbers. This list is based on SIS needs, e.g. in {@code
DataStore}

Modified: sis/branches/0.6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.6/pom.xml?rev=1702543&r1=1702542&r2=1702543&view=diff
==============================================================================
--- sis/branches/0.6/pom.xml (original)
+++ sis/branches/0.6/pom.xml Fri Sep 11 20:08:02 2015
@@ -68,12 +68,12 @@ Apache SIS is a free software, Java lang
        ============================================================== -->
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/sis/trunk
+      scm:svn:http://svn.apache.org/repos/asf/sis/branches/0.6
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/sis/trunk
+      scm:svn:https://svn.apache.org/repos/asf/sis/branches/0.6
     </developerConnection>
-    <url>http://svn.apache.org/viewvc/sis/trunk</url>
+    <url>http://svn.apache.org/viewvc/sis/branches/0.6</url>
   </scm>
 
   <ciManagement>
@@ -410,7 +410,7 @@ Apache SIS is a free software, Java lang
     <!-- Following properties are branch-specific -->
     <maven.compile.source>1.6</maven.compile.source>
     <maven.compile.target>1.6</maven.compile.target>
-    <sis.plugin.version>${project.version}</sis.plugin.version>
+    <sis.plugin.version>0.6</sis.plugin.version>
     <geoapi.version>3.0.0</geoapi.version>
   </properties>
 
@@ -700,25 +700,6 @@ Apache SIS is a free software, Java lang
 
 
   <!-- ==============================================================
-         Additional repositories from which to download artifacts.
-         The parent pom.xml already declares the apache.snapshots
-         repository for library artifacts. But we also need it for
-         Maven plugins in order to download sis-build-helper when
-         the user did not built it himself.
-       ============================================================== -->
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-
-
-  <!-- ==============================================================
          Group of modules to build in approximate dependency order.
        ============================================================== -->
   <modules>



Mime
View raw message