sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/07: Prepare the branch for the 0.6 release.
Date Thu, 21 Jun 2018 10:53:00 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to annotated tag 0.6
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3d90d388225fec00b158d39e001dd4164c31ef81
Author: Martin Desruisseaux <desruisseaux@apache.org>
AuthorDate: Fri Sep 11 20:08:02 2015 +0000

    Prepare the branch for the 0.6 release.
    
    git-svn-id: https://svn.apache.org/repos/asf/sis/branches/0.6@1702543 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/ant/prepare-release.xml               |  2 +-
 .../operation/projection/ConformalProjection.java  |  2 +-
 .../operation/projection/TransverseMercator.java   |  3 ++-
 .../org/apache/sis/internal/system/Supervisor.java |  2 +-
 .../sis/internal/util/TemporalUtilities.java       |  2 +-
 .../src/main/java/org/apache/sis/util/Version.java |  2 +-
 pom.xml                                            | 27 ++++------------------
 7 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/core/sis-build-helper/src/main/ant/prepare-release.xml b/core/sis-build-helper/src/main/ant/prepare-release.xml
index 563f60d..533b433 100644
--- a/core/sis-build-helper/src/main/ant/prepare-release.xml
+++ b/core/sis-build-helper/src/main/ant/prepare-release.xml
@@ -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"
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
index b9ef4ed..0e26539 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
@@ -85,7 +85,7 @@ abstract class ConformalProjection extends NormalizedProjection {
      * 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)}.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
index 758d1e3..2d288a3 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
@@ -100,7 +100,7 @@ public class TransverseMercator extends NormalizedProjection {
      * 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 NormalizedProjection {
             sin_8ξ = sin(8*ξ);
             cos_8ξ = cos(8*ξ);
 
+            sinh_2η = sinh(2*η);
             cosh_2η = cosh(2*η);
             sinh_4η = sinh(4*η);
             cosh_4η = cosh(4*η);
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
b/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
index f96776b..ebd94d3 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
@@ -60,7 +60,7 @@ public final class Supervisor extends StandardMBean implements SupervisorMBean,
      * 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.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
b/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
index 0700ccc..91579a7 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
@@ -43,7 +43,7 @@ public final class TemporalUtilities extends Static {
      *
      * 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.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Version.java b/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
index 78ffd48..9b966df 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
@@ -60,7 +60,7 @@ public class Version implements CharSequence, Comparable<Version>,
Serializable
     /**
      * 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}
diff --git a/pom.xml b/pom.xml
index e416526..a17a1e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,12 +68,12 @@ Apache SIS is a free software, Java language library for developing geospatial
a
        ============================================================== -->
   <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 language library for developing geospatial
a
     <!-- 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 language library for developing geospatial
a
 
 
   <!-- ==============================================================
-         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