sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
Date Tue, 31 Jul 2018 09:42:05 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit d281917ba04f36b6230e0914f6c50af3294b4284
Merge: 794af35 6931fdd
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Jul 31 11:35:41 2018 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1.

 .../main/java/org/apache/sis/math/Fraction.java    |  17 +-
 .../java/org/apache/sis/measure/AbstractUnit.java  |   8 +-
 .../org/apache/sis/measure/ConventionalUnit.java   |   2 +-
 .../java/org/apache/sis/measure/DerivedScalar.java | 270 +++++++
 .../java/org/apache/sis/measure/Quantities.java    |  34 +-
 .../main/java/org/apache/sis/measure/Scalar.java   | 108 ++-
 .../java/org/apache/sis/measure/ScalarFactory.java |  23 +-
 .../java/org/apache/sis/measure/UnitFormat.java    |  35 +-
 .../main/java/org/apache/sis/measure/Units.java    |  20 +-
 .../sis/util/collection/DerivedIterator.java       |   2 +-
 .../org/apache/sis/util/collection/DerivedSet.java |   4 +-
 .../java/org/apache/sis/math/FractionTest.java     |  16 +-
 .../org/apache/sis/measure/QuantitiesTest.java     |  42 +-
 .../org/apache/sis/measure/UnitFormatTest.java     |  13 +
 ide-project/NetBeans/nbproject/build-impl.xml      | 816 ++++++++++++++-------
 ide-project/NetBeans/nbproject/genfiles.properties |   6 +-
 ide-project/NetBeans/nbproject/project.properties  |   3 +-
 17 files changed, 1088 insertions(+), 331 deletions(-)

diff --cc ide-project/NetBeans/nbproject/build-impl.xml
index d8cd687,1fdcce1..a417bfd
--- a/ide-project/NetBeans/nbproject/build-impl.xml
+++ b/ide-project/NetBeans/nbproject/build-impl.xml
@@@ -19,7 -19,7 +19,7 @@@ is divided into following sections
    - cleanup
  
          -->
- <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default"
name="Apache_SIS_on_GeoAPI_3.1-impl">
 -<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1"
xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc"
xmlns:unless="ant:unless" basedir=".." default="default" name="Apache_SIS_on_GeoAPI_4.0-impl">
++<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1"
xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc"
xmlns:unless="ant:unless" basedir=".." default="default" name="Apache_SIS_on_GeoAPI_3.1-impl">
      <fail message="Please build using Ant 1.8.0 or higher.">
          <condition>
              <not>
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 11e6a4b,441c800..09619b2
--- 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=5c9f3b18
- nbproject/build-impl.xml.script.CRC32=fb8d24ed
- nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
 -nbproject/build-impl.xml.data.CRC32=f62bab13
 -nbproject/build-impl.xml.script.CRC32=a7689f96
++nbproject/build-impl.xml.data.CRC32=f2050c18
++nbproject/build-impl.xml.script.CRC32=aa8f5386
+ nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48


Mime
View raw message