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-3.1'
Date Wed, 11 Sep 2019 16:43:50 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 0ba78ebbdd2cecd6d746a821fe1a8abdd5fc9d6f
Merge: a888fcd e84fbdf
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Sep 11 18:42:55 2019 +0200

    Merge branch 'geoapi-3.1'

 README                                             |  28 +-
 .../main/java/org/apache/sis/console/Command.java  |   6 +-
 .../org/apache/sis/internal/doclet/Include.java    |   2 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |   2 +-
 .../apache/sis/internal/metadata/Identifiers.java  |   4 +-
 .../main/java/org/apache/sis/util/iso/Names.java   |  20 +-
 .../java/org/apache/sis/util/iso/package-info.java |   3 +-
 .../java/org/apache/sis/xml/ValueConverter.java    |   6 +-
 .../src/main/java/org/apache/sis/xml/XLink.java    |  20 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |   7 +-
 .../java/org/apache/sis/geometry/Envelope2D.java   |   7 +-
 .../java/org/apache/sis/geometry/Envelopes.java    |   4 +-
 .../org/apache/sis/geometry/GeneralEnvelope.java   |   7 +-
 .../java/org/apache/sis/geometry/package-info.java |   4 +-
 .../referencing/PositionalAccuracyConstant.java    |   3 +
 .../internal/referencing/SignReversalComment.java  |   3 +
 .../java/org/apache/sis/io/wkt/Convention.java     |   7 +-
 .../main/java/org/apache/sis/io/wkt/Symbols.java   |  10 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |  16 +-
 .../main/java/org/apache/sis/referencing/CRS.java  |  12 +-
 .../java/org/apache/sis/referencing/CommonCRS.java |  33 ++-
 .../sis/referencing/crs/DefaultCompoundCRS.java    |  14 +-
 .../sis/referencing/datum/BursaWolfParameters.java |  18 +-
 .../factory/GeodeticAuthorityFactory.java          |  69 +++--
 .../referencing/factory/sql/EPSGDataAccess.java    |  33 ++-
 .../operation/AbstractCoordinateOperation.java     |   2 +-
 .../referencing/operation/matrix/MatrixSIS.java    |   3 +-
 .../referencing/operation/matrix/package-info.java |   4 +-
 .../operation/projection/NormalizedProjection.java |  24 +-
 .../operation/transform/ContextualParameters.java  |  28 +-
 .../operation/transform/DatumShiftTransform.java   |  33 +--
 .../transform/DefaultMathTransformFactory.java     |   2 +-
 .../operation/transform/LinearTransform.java       |   6 +-
 .../referencing/operation/transform/formulas.html  |  12 +-
 .../sis/internal/converter/SystemConverter.java    |   3 +
 .../src/main/java/org/apache/sis/math/Plane.java   |   3 +-
 .../main/java/org/apache/sis/math/Statistics.java  |   3 +-
 .../main/java/org/apache/sis/measure/Units.java    | 287 ++++++++++++---------
 .../org/apache/sis/util/LenientComparable.java     |   3 +-
 .../org/apache/sis/util/collection/TreeTable.java  |   3 +-
 .../apache/sis/util/logging/MonolineFormatter.java |   3 +-
 pom.xml                                            |   4 +-
 src/main/javadoc/sis.css                           |  22 ++
 .../org/apache/sis/internal/netcdf/Convention.java |   2 +-
 .../apache/sis/storage/netcdf/AttributeNames.java  |   3 +-
 .../org/apache/sis/storage/WritableAggregate.java  |   2 +-
 46 files changed, 467 insertions(+), 323 deletions(-)

diff --cc pom.xml
index f251103,f4012ae..cae4606
--- a/pom.xml
+++ b/pom.xml
@@@ -863,9 -863,11 +863,11 @@@
            <keywords>true</keywords>                             <!-- Adds
HTML meta keyword tags to the generated files. -->
            <breakiterator>true</breakiterator>                   <!-- Better
boundary detection when determining the end of the first sentence. -->
            <validateLinks>true</validateLinks>                   <!-- Validates
content of package-list resources. -->
+           <detectJavaApiLink>false</detectJavaApiLink>          <!-- Let
us declare link to Java API. -->
            <links>
+             <link>https://docs.oracle.com/javase/8/docs/api</link>
              <link>http://unitsofmeasurement.github.io/unit-api/site/apidocs</link>
 -            <link>http://www.geoapi.org/snapshot/pending</link>
 +            <link>http://www.geoapi.org/3.0/javadoc</link>
              <link>http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/javadoc</link>
            </links>
  


Mime
View raw message