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 c654790fded63e2b5bfcdf2d4cbf1399e5722a12 Merge: 8f4b197bc6 0666ddb3dd Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon May 9 13:59:20 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 application/sis-console/pom.xml | 1 - .../java/org/apache/sis/console/package-info.java | 2 +- application/sis-javafx/pom.xml | 3 + application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- .../main/java/org/apache/sis/gui/package-info.java | 8 ++ application/sis-openoffice/pom.xml | 2 +- cloud/sis-cloud-S3/pom.xml | 2 +- .../apache/sis/cloud/aws/s3/ClientFileSystem.java | 40 +++++-- .../org/apache/sis/cloud/aws/s3/FileService.java | 14 ++- .../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 118 ++++++++++----------- .../apache/sis/cloud/aws/s3/KeyPathMatcher.java | 22 +++- .../apache/sis/cloud/aws/s3/ObjectAttributes.java | 2 +- .../org/apache/sis/cloud/aws/s3/PathIterator.java | 12 ++- .../org/apache/sis/cloud/aws/s3/package-info.java | 2 +- .../sis/cloud/aws/s3/ClientFileSystemTest.java | 4 +- .../sis/cloud/aws/s3/KeyPathMatcherTest.java | 2 +- .../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 24 ++--- core/sis-build-helper/pom.xml | 8 +- core/sis-cql/pom.xml | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 4 +- .../java/org/apache/sis/image/MaskedImage.java | 2 +- .../internal/coverage/j2d/ColorModelFactory.java | 3 +- .../apache/sis/internal/jaxb/gml/TimeInstant.java | 2 +- .../metadata/legacy/LegacyPropertyAdapter.java | 2 +- .../sis/internal/metadata/sql/Initializer.java | 21 +--- .../sis/internal/metadata/sql/LocalDataSource.java | 12 +-- .../org/apache/sis/metadata/MetadataStandard.java | 5 +- .../org/apache/sis/metadata/PropertyAccessor.java | 2 +- .../iso/acquisition/DefaultRequirement.java | 2 + .../iso/citation/DefaultResponsibleParty.java | 2 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../sis/metadata/iso/quality/DefaultScope.java | 2 +- .../apache/sis/metadata/sql/MetadataWriter.java | 2 +- .../metadata/iso/citation/HardCodedCitations.java | 5 +- .../sis/metadata/sql/MetadataWriterTest.java | 3 +- .../java/org/apache/sis/test/sql/TestDatabase.java | 2 +- .../java/org/apache/sis/test/xml/InfiniteSet.java | 2 +- .../apache/sis/geometry/GeneralDirectPosition.java | 9 +- .../sis/internal/referencing/AxisDirections.java | 4 +- .../referencing/j2d/AffineTransform2D.java | 2 +- .../apache/sis/internal/referencing/j2d/Tile.java | 2 +- .../parameter/DefaultParameterDescriptorGroup.java | 2 +- .../sis/parameter/DefaultParameterValue.java | 2 +- .../org/apache/sis/parameter/TensorParameters.java | 7 +- .../sis/referencing/AbstractIdentifiedObject.java | 2 +- .../main/java/org/apache/sis/referencing/CRS.java | 4 +- .../sis/referencing/EPSGFactoryFallback.java | 46 +++++++- .../sis/referencing/datum/BursaWolfParameters.java | 2 +- .../referencing/datum/DefaultVerticalDatum.java | 2 +- .../sis/referencing/datum/TimeDependentBWP.java | 2 +- .../factory/GeodeticAuthorityFactory.java | 6 +- .../referencing/factory/GeodeticObjectFactory.java | 8 +- .../referencing/factory/sql/EPSGCodeFinder.java | 2 +- .../referencing/factory/sql/EPSGDataAccess.java | 7 +- .../sis/referencing/factory/sql/EPSGFactory.java | 4 +- .../sis/referencing/factory/sql/package-info.java | 2 +- .../DefaultCoordinateOperationFactory.java | 2 +- .../referencing/operation/projection/Mercator.java | 13 +-- .../operation/projection/package-info.java | 2 +- .../transform/DefaultMathTransformFactory.java | 12 +-- .../operation/transform/TransferFunction.java | 2 +- .../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +- .../factory/AuthorityFactoryProxyTest.java | 2 +- .../referencing/factory/sql/EPSGInstallerTest.java | 2 +- .../factory/sql/epsg/DataScriptFormatter.java | 3 +- .../sis/referencing/factory/sql/epsg/package.html | 4 +- .../operation/DefaultConversionTest.java | 2 +- .../operation/DefaultTransformationTest.java | 2 +- .../projection/ProjectionResultComparator.java | 2 +- .../report/CoordinateOperationMethods.java | 9 +- .../report/CoordinateReferenceSystems.java | 6 +- .../sis/referencing/report/HTMLGenerator.java | 2 +- .../apache/sis/internal/system/DataDirectory.java | 4 +- .../org/apache/sis/internal/util/Constants.java | 2 +- .../apache/sis/internal/util/DefinitionURI.java | 2 +- .../apache/sis/internal/util/FinalFieldSetter.java | 112 ++++++++----------- .../apache/sis/internal/util/MetadataServices.java | 8 +- .../org/apache/sis/internal/util/Numerics.java | 2 +- .../java/org/apache/sis/internal/util/Strings.java | 2 +- .../java/org/apache/sis/internal/util/URLs.java | 62 +++++++++++ .../java/org/apache/sis/measure/AbstractUnit.java | 2 +- .../main/java/org/apache/sis/measure/Range.java | 4 +- .../java/org/apache/sis/measure/RangeFormat.java | 7 +- .../java/org/apache/sis/measure/UnitFormat.java | 5 +- .../java/org/apache/sis/setup/Configuration.java | 4 +- .../apache/sis/setup/InstallationResources.java | 22 +++- .../apache/sis/setup/OptionalInstallations.java | 30 ++++-- .../java/org/apache/sis/util/CharSequences.java | 2 +- .../main/java/org/apache/sis/util/Exceptions.java | 3 +- .../apache/sis/util/resources/package-info.java | 7 +- .../org/apache/sis/math/DecimalFunctionsTest.java | 2 +- .../sis/util/collection/TreeTableFormatTest.java | 2 +- ide-project/NetBeans/nbproject/project.properties | 15 ++- pom.xml | 22 ++-- src/main/config/security.policy | 51 --------- .../sis/storage/landsat/LandsatStoreProvider.java | 7 +- .../sis/storage/geotiff/GeoTiffStoreProvider.java | 11 +- .../sis/storage/geotiff/GridGeometryBuilder.java | 2 +- .../org/apache/sis/internal/netcdf/Raster.java | 2 +- .../org/apache/sis/internal/storage/CodeType.java | 2 +- .../sis/internal/storage/ResourceOnFileSystem.java | 3 + .../sis/internal/storage/TiledGridCoverage.java | 2 +- .../sis/internal/storage/folder/WritableStore.java | 2 +- .../sis/internal/storage/image/WorldFileStore.java | 52 ++++----- .../storage/image/WorldFileStoreProvider.java | 2 +- .../sis/internal/storage/image/WritableStore.java | 22 ++++ .../internal/storage/io/HyperRectangleReader.java | 2 +- .../sis/internal/storage/io/IOUtilities.java | 26 +++-- .../sis/storage/AbstractGridCoverageResource.java | 2 +- .../org/apache/sis/storage/DataStoreProvider.java | 4 +- .../internal/storage/image/WorldFileStoreTest.java | 6 ++ .../sis/internal/storage/io/IOUtilitiesTest.java | 1 + .../apache/sis/internal/storage/xml/StoreTest.java | 4 +- 113 files changed, 591 insertions(+), 462 deletions(-) diff --cc core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java index c1e818fd34,07fc075cd6..286bb62b9a --- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java @@@ -24,10 -24,9 +24,11 @@@ import org.opengis.metadata.citation.Pr import org.apache.sis.metadata.iso.DefaultIdentifier; import org.apache.sis.util.SimpleInternationalString; import org.apache.sis.internal.util.Constants; + import org.apache.sis.internal.util.URLs; import org.apache.sis.util.Static; +import static java.util.Collections.singleton; + /** * Hard-coded citation constants used for testing purpose only. @@@ -90,12 -89,11 +91,12 @@@ public final strictfp class HardCodedCi */ public static final DefaultCitation EPSG; static { - final DefaultOnlineResource r = new DefaultOnlineResource(URI.create("https://epsg.org/";)); + final DefaultOnlineResource r = new DefaultOnlineResource(URI.create(URLs.EPSG)); r.setFunction(OnLineFunction.INFORMATION); - final DefaultResponsibility p = new DefaultResponsibility(Role.PRINCIPAL_INVESTIGATOR, null, - new DefaultOrganisation("International Association of Oil & Gas Producers", null, null, new DefaultContact(r))); + final DefaultResponsibleParty p = new DefaultResponsibleParty(Role.PRINCIPAL_INVESTIGATOR); + p.setParties(singleton(new DefaultOrganisation("International Association of Oil & Gas Producers", + null, null, new DefaultContact(r)))); final DefaultCitation c = new DefaultCitation("EPSG Geodetic Parameter Dataset"); c.getPresentationForms().add(PresentationForm.TABLE_DIGITAL); diff --cc ide-project/NetBeans/nbproject/project.properties index 7f32032e96,40225666cc..494b611753 --- a/ide-project/NetBeans/nbproject/project.properties +++ b/ide-project/NetBeans/nbproject/project.properties @@@ -94,9 -99,9 +92,10 @@@ test.jpn-profile.dir = ${project.root}/ # Those dependencies must exist in the local Maven repository. # Those numbers should match the ones declared in the pom.xml files. # +geoapi.version = 3.1-SNAPSHOT jsr363.version = 1.0 jaxb.version = 2.3.3 + jaxb.runtime = 2.3.6 istack.version = 3.0.11 activation.version = 1.2.2 jama.version = 1.0.3 diff --cc pom.xml index 432b160602,d5858f3982..11c6246f79 --- a/pom.xml +++ b/pom.xml @@@ -558,8 -558,7 +558,7 @@@ <sis.plugin.version>${project.version}</sis.plugin.version> <sis.non-free.version>1.1</sis.non-free.version> <!-- Used only if "non-free" profile is activated. --> <javafx.version>17</javafx.version> <!-- Used only if "javafx" profile is activated. --> - <geoapi.version>4.0-SNAPSHOT</geoapi.version> + <geoapi.version>3.1-SNAPSHOT</geoapi.version> - <jaxb.version>2.3.3</jaxb.version> </properties> <profiles>
