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 Wed, 15 Aug 2018 15:40:34 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 6277ad79eaf08a1ed1e33a251abee633c6b5a77f
Merge: 11d4e97 879060d
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Aug 15 17:24:30 2018 +0200

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

 .../org.apache.sis.setup.InstallationResources     |   3 +-
 .../org/apache/sis/console/Commands.properties     |   3 +-
 .../org/apache/sis/console/Commands_fr.properties  |   3 +-
 .../apache/sis/console/IdentifierState.properties  |   3 +-
 .../sis/console/IdentifierState_fr.properties      |   3 +-
 .../org/apache/sis/console/Messages.properties     |   3 +-
 .../org/apache/sis/console/Messages_fr.properties  |   3 +-
 .../org/apache/sis/console/Options.properties      |   3 +-
 .../org/apache/sis/console/Options_fr.properties   |   3 +-
 application/sis-javafx/pom.xml                     |  11 ++
 core/sis-build-helper/pom.xml                      |  59 ++-----
 .../apache/sis/internal/book/CodeColorizer.java    |  32 ++--
 .../org/apache/sis/internal/doclet/Doclet.java     | 105 +++++++++---
 .../sis/internal/{taglet => doclet}/Include.java   |  42 ++---
 .../apache/sis/internal/doclet/InlineTaglet.java   | 158 ++++++++++++++++++
 .../org/apache/sis/internal/doclet/Module.java     | 113 +++++++++++++
 .../sis/internal/{taglet => doclet}/Preformat.java |  50 ++----
 .../org/apache/sis/internal/doclet/Rewriter.java   |   2 +-
 .../apache/sis/internal/doclet/package-info.java   |   5 +-
 .../apache/sis/internal/taglet/InlineTaglet.java   | 170 -------------------
 .../org/apache/sis/internal/taglet/Module.java     | 182 ---------------------
 .../apache/sis/internal/taglet/package-info.java   |  27 ---
 .../org/apache/sis/feature/DefaultFeatureType.java |   2 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |   2 +-
 .../sis/internal/metadata/sql/Initializer.java     |  55 ++++++-
 .../org/apache/sis/metadata/sql/Installer.java     |  13 +-
 .../org/apache/sis/metadata/sql/Contents.sql       |  36 ++++
 .../org/apache/sis/metadata/sql/Metadata.sql       |  15 ++
 .../org/apache/sis/metadata/sql/Referencing.sql    |  25 +++
 .../internal/jaxb/cat/CodeListMarshallingTest.java |  18 +-
 .../sis/internal/jaxb/cat/EnumMarshallingTest.java |   6 +-
 .../sis/internal/jaxb/lan/LanguageCodeTest.java    |   2 +-
 .../sis/internal/jaxb/lan/PT_LocaleTest.java       |   2 +-
 .../extent/DefaultGeographicBoundingBoxTest.java   |   2 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |   6 +-
 .../gazetteer/MilitaryGridReferenceSystemTest.java |   2 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |   4 +-
 .../apache/sis/referencing/cs/AxesConvention.java  |   7 +-
 .../sis/referencing/datum/BursaWolfParameters.java |   8 +-
 .../sis/referencing/datum/DefaultEllipsoid.java    |   2 +-
 .../factory/ConcurrentAuthorityFactory.java        |   2 +-
 .../factory/IdentifiedObjectFinder.java            |   8 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |   2 +-
 .../operation/CoordinateOperationRegistry.java     |   2 +-
 .../operation/builder/LinearTransformBuilder.java  |   2 +-
 .../operation/builder/TransformBuilder.java        |   2 +-
 .../operation/matrix/GeneralMatrix.java            |   2 +-
 .../operation/projection/ConformalProjection.java  |   2 +-
 .../referencing/operation/projection/Mercator.java |   2 +-
 .../operation/projection/NormalizedProjection.java |   2 +-
 .../transform/AbstractLinearTransform.java         |   2 +-
 .../operation/transform/AbstractMathTransform.java |   2 +-
 .../operation/transform/ConcatenatedTransform.java |   2 +-
 .../transform/EllipsoidToCentricTransform.java     |   2 +-
 .../operation/transform/MathTransforms.java        |   4 +-
 ...org.apache.sis.internal.jaxb.AdapterReplacement |   3 +-
 .../org.apache.sis.internal.jaxb.TypeRegistration  |   3 +-
 ...rg.apache.sis.internal.metadata.sql.Initializer |   3 +-
 ...org.opengis.referencing.crs.CRSAuthorityFactory |   3 +-
 .../org.opengis.referencing.crs.CRSFactory         |   3 +-
 .../services/org.opengis.referencing.cs.CSFactory  |   3 +-
 .../org.opengis.referencing.datum.DatumFactory     |   3 +-
 ...eferencing.operation.CoordinateOperationFactory |   3 +-
 ...ngis.referencing.operation.MathTransformFactory |   3 +-
 ...g.opengis.referencing.operation.OperationMethod |   5 +-
 .../datum/DefaultVerticalDatumTest.java            |   2 +-
 .../operation/CoordinateOperationFinderTest.java   |   2 +-
 .../builder/LocalizationGridBuilderTest.java       |   2 +-
 .../operation/matrix/MatrixTestCase.java           |   6 +-
 .../projection/MercatorMethodComparison.java       |   2 +-
 .../projection/ObliqueStereographicTest.java       |   2 +-
 .../projection/ProjectionResultComparator.java     |   4 +-
 .../operation/transform/CoordinateDomainTest.java  |   4 +-
 .../operation/transform/CopyTransformTest.java     |   2 +-
 .../transform/InterpolatedTransformTest.java       |   2 +-
 .../transform/MolodenskyTransformTest.java         |   4 +-
 .../sis/test/integration/ConsistencyTest.java      |   2 +-
 ...g.opengis.referencing.operation.OperationMethod |   3 +-
 .../sis/referencing/operation/Conversion.xml       |   4 +-
 .../sis/internal/converter/FractionConverter.java  |  14 +-
 .../org/apache/sis/internal/system/Loggers.java    |   2 +-
 .../apache/sis/internal/util/CollectionsExt.java   |   2 +
 .../org/apache/sis/internal/util/DoubleDouble.java |   6 +-
 .../org/apache/sis/internal/util/Numerics.java     |   6 +-
 .../java/org/apache/sis/math/DecimalFunctions.java |   6 +-
 .../main/java/org/apache/sis/math/Statistics.java  |   2 +-
 .../src/main/java/org/apache/sis/math/Vector.java  |   2 +-
 .../java/org/apache/sis/measure/AbstractUnit.java  |   3 +
 .../java/org/apache/sis/measure/DerivedScalar.java |  31 ++--
 .../org/apache/sis/measure/LinearConverter.java    |  34 +++-
 .../main/java/org/apache/sis/measure/Prefixes.java |   2 +-
 .../java/org/apache/sis/measure/Quantities.java    |   1 -
 .../org/apache/sis/measure/ScalarFallback.java     |  26 +--
 .../java/org/apache/sis/measure/UnitFormat.java    |   4 +-
 .../main/java/org/apache/sis/measure/Units.java    |  29 +++-
 .../java/org/apache/sis/measure/package-info.java  |  33 ++++
 .../java/org/apache/sis/util/ComparisonMode.java   |   4 +-
 .../main/java/org/apache/sis/util/Utilities.java   |   6 +-
 .../apache/sis/util/collection/CodeListSet.java    |   2 +-
 .../org/apache/sis/util/collection/DerivedMap.java |  21 ++-
 .../org/apache/sis/util/collection/DerivedSet.java |   2 +-
 .../apache/sis/util/logging/MonolineFormatter.java |   2 +-
 .../sis/util/resources/IndexedResourceBundle.java  |   2 +-
 .../services/javax.measure.spi.ServiceProvider     |   3 +-
 .../services/org.apache.sis.util.ObjectConverter   |   5 +-
 .../META-INF/services/org.opengis.util.NameFactory |   3 +-
 .../sis/internal/system/Descriptions.properties    |   3 +-
 .../sis/internal/system/Descriptions_fr.properties |   3 +-
 .../org/apache/sis/measure/UnitAliases.properties  |   3 +-
 .../org/apache/sis/measure/UnitNames.properties    |   3 +-
 .../apache/sis/measure/UnitNames_en_US.properties  |   3 +-
 .../org/apache/sis/measure/UnitNames_fr.properties |   3 +-
 .../apache/sis/internal/util/DoubleDoubleTest.java |   4 +-
 .../apache/sis/measure/LinearConverterTest.java    |  10 ++
 .../org/apache/sis/measure/RangeFormatTest.java    |  18 +-
 .../src/test/java/org/apache/sis/test/Assert.java  |  12 +-
 .../sis/util/collection/WeakValueHashMapTest.java  |   2 +-
 ide-project/NetBeans/build.xml                     |  10 ++
 ide-project/NetBeans/nbproject/project.properties  |   2 +-
 pom.xml                                            |  71 ++++----
 .../org/apache/sis/storage/geotiff/CRSBuilder.java |   2 +-
 .../apache/sis/storage/netcdf/MetadataReader.java  |   2 +-
 .../shapefile/jdbc/connection/DBFConnection.java   |   2 +-
 .../jdbc/resultset/AbstractResultSet.java          |   2 +-
 .../shapefile/jdbc/statement/DBFStatement.java     |   4 +-
 .../sis/internal/storage/MetadataBuilder.java      |   2 +-
 126 files changed, 939 insertions(+), 776 deletions(-)

diff --cc ide-project/NetBeans/nbproject/project.properties
index e13dcb2,160ff9e..a40f6b7
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -123,9 -129,9 +123,9 @@@ icons.version        = 3.0.
  # The dependencies are read directy from the local Maven directory.
  #
  maven.repository   = ${user.home}/.m2/repository
- endorsed.classpath=
+ endorsed.classpath =
  javac.classpath=\
 -    ${project.GeoAPI}/dist/geoapi.jar:\
 +    ${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
      ${maven.repository}/javax/measure/unit-api/${jsr363.version}/unit-api-${jsr363.version}.jar:\
      ${maven.repository}/com/esri/geometry/esri-geometry-api/${esri.api.version}/esri-geometry-api-${esri.api.version}.jar:\
      ${maven.repository}/org/locationtech/jts/jts-core/${jts.version}/jts-core-${jts.version}.jar:\
diff --cc pom.xml
index e2f2dcf,15e4fd4..2be7b00
--- a/pom.xml
+++ b/pom.xml
@@@ -510,11 -510,11 +510,11 @@@
      <website.locale>en</website.locale>
  
      <!-- Following properties are branch-specific -->
-     <maven.compile.source>1.8</maven.compile.source>
-     <maven.compile.target>1.8</maven.compile.target>
+     <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>
 -    <geoapi.version>4.0-SNAPSHOT</geoapi.version>
 +    <geoapi.version>3.1-SNAPSHOT</geoapi.version>
    </properties>
  
    <profiles>


Mime
View raw message