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 b30fc90ef958cc74c6fff89c1cd34cdb6e259200 Merge: eaaec69 543113b Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Oct 17 18:50:08 2018 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. application/sis-openoffice/pom.xml | 6 + .../apache/sis/io/wkt/GeodeticObjectParser.java | 2 +- .../org/apache/sis/coverage/grid/GridExtent.java | 71 +++++- .../org/apache/sis/coverage/grid/GridGeometry.java | 281 ++++++++++++++------- .../apache/sis/coverage/grid/GridGeometryTest.java | 20 +- .../org/apache/sis/referencing/cs/AbstractCS.java | 8 +- .../operation/AbstractCoordinateOperation.java | 5 +- .../operation/matrix/GeneralMatrix.java | 5 +- .../operation/projection/ObliqueMercator.java | 2 +- .../sis/test/integration/ConsistencyTest.java | 63 ++++- .../org/apache/sis/internal/util/Numerics.java | 17 +- .../apache/sis/measure/SexagesimalConverter.java | 20 +- .../main/java/org/apache/sis/measure/Units.java | 2 +- .../main/java/org/apache/sis/util/Utilities.java | 8 +- .../org/apache/sis/util/resources/Vocabulary.java | 35 +++ .../sis/util/resources/Vocabulary.properties | 7 + .../sis/util/resources/Vocabulary_fr.properties | 7 + .../sis/measure/SexagesimalConverterTest.java | 13 +- pom.xml | 15 +- .../org/apache/sis/internal/storage/csv/Store.java | 7 +- 20 files changed, 449 insertions(+), 145 deletions(-) diff --cc pom.xml index 2cb5d3d,c6de25f..d151b45 --- a/pom.xml +++ b/pom.xml @@@ -513,8 -524,8 +524,8 @@@ <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <sis.plugin.version>${project.version}</sis.plugin.version> - <sis.non-free.version>0.8</sis.non-free.version> + <sis.non-free.version>1.0-M1</sis.non-free.version> - <geoapi.version>4.0-SNAPSHOT</geoapi.version> + <geoapi.version>3.1-SNAPSHOT</geoapi.version> </properties> <profiles>
