sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/02: Merge branch 'geoapi-3.1'.
Date Thu, 21 Jun 2018 14:56:15 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 2063b6918a38f0180e912e3c5ebebd17cfe3df7a
Merge: 94afe6c fcd6c5d
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Thu Jun 21 10:33:37 2018 +0200

    Merge branch 'geoapi-3.1'.

 .../src/main/java/org/apache/sis/console/package-info.java  |  2 +-
 .../src/main/java/org/apache/sis/feature/Validator.java     |  2 +-
 .../java/org/apache/sis/internal/simple/SimpleCitation.java |  2 +-
 .../apache/sis/metadata/iso/citation/DefaultAddress.java    |  2 +-
 .../src/test/java/org/apache/sis/metadata/TreeNodeTest.java |  2 +-
 .../test/java/org/apache/sis/metadata/iso/APIVerifier.java  |  4 ++--
 .../org/apache/sis/metadata/iso/api-changes.properties      |  2 +-
 .../java/org/apache/sis/internal/system/Supervisor.java     |  2 +-
 .../org/apache/sis/internal/util/StandardDateFormat.java    |  8 --------
 .../org/apache/sis/internal/util/TemporalUtilities.java     |  2 +-
 .../src/main/java/org/apache/sis/util/CharSequences.java    |  2 +-
 .../apache/sis/util/collection/BackingStoreException.java   |  5 ++---
 .../apache/sis/internal/util/StandardDateFormatTest.java    |  2 --
 ide-project/NetBeans/nbproject/genfiles.properties          |  2 +-
 ide-project/NetBeans/nbproject/project.properties           | 13 +++++++------
 ide-project/NetBeans/nbproject/project.xml                  |  1 +
 pom.xml                                                     |  6 +++---
 17 files changed, 25 insertions(+), 34 deletions(-)

diff --cc core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
index a75e6c9,f605c96..e3a7a88
--- 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,9 -60,9 +60,9 @@@ public final class Supervisor extends S
       * Whatever JMX agent is enabled. Setting this variable to {@code false} allows the
       * Java compiler to omit any dependency to this {@code Supervisor} class.
       *
-      * @see <a href="http://sis.apache.org/branches.html#trunk">Differences between
SIS trunk and branches</a>
+      * @see <a href="http://sis.apache.org/branches.html#master">Differences between
SIS master and branches</a>
       */
 -    static final boolean ENABLED = true;
 +    static final boolean ENABLED = false;
  
      /**
       * The JMX object name for the {@code Supervisor} service.
diff --cc core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
index 3277d44,c72e1cd..78b952d
--- 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
@@@ -44,9 -44,9 +44,9 @@@ public final class TemporalUtilities ex
       *
       * This constant will be removed after SIS release a sis-temporal module.
       *
-      * @see <a href="http://sis.apache.org/branches.html#trunk">Differences between
SIS trunk and branches</a>
+      * @see <a href="http://sis.apache.org/branches.html#master">Differences between
SIS master and branches</a>
       */
 -    public static final boolean REPORT_MISSING_MODULE = true;
 +    public static final boolean REPORT_MISSING_MODULE = false;
  
      /**
       * Do not allow instantiation of this class.
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 67e4176,c89c1fe..7867cbe3
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=a2f58f6b
 -nbproject/build-impl.xml.data.CRC32=5a0e9d09
 -nbproject/build-impl.xml.script.CRC32=fb8d24ed
++nbproject/build-impl.xml.data.CRC32=846ff049
 +nbproject/build-impl.xml.script.CRC32=3e1070bc
  nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48


Mime
View raw message