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 445620db529dee795eabbaa298ffec67dcf4f345
Merge: 05dc18652a 3ac45c141f
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Feb 21 16:56:06 2024 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1:
post-merge imports organization.
.../test/org/apache/sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../test/org/apache/sis/coverage/grid/GridDerivationTest.java | 2 +-
.../org/apache/sis/coverage/grid/ResampledGridCoverageTest.java | 2 +-
.../test/org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java | 2 +-
.../test/org/apache/sis/feature/FeatureTestCase.java | 2 +-
.../apache/sis/feature/builder/CharacteristicTypeBuilderTest.java | 2 +-
.../test/org/apache/sis/feature/test/FeatureComparator.java | 2 +-
.../test/org/apache/sis/geometry/wrapper/esri/FactoryTest.java | 2 +-
.../test/org/apache/sis/geometry/wrapper/j2d/FactoryTest.java | 2 +-
.../test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java | 2 ++
.../test/org/apache/sis/geometry/wrapper/jts/FactoryTest.java | 2 +-
.../test/org/apache/sis/image/MaskedImageTest.java | 4 +++-
.../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../test/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java | 2 +-
.../iso/identification/DefaultServiceIdentificationTest.java | 2 +-
.../org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java | 2 +-
.../sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java | 2 +-
.../test/org/apache/sis/util/iso/DefaultNameFactoryTest.java | 2 +-
.../test/org/apache/sis/util/iso/SerializableRecordSchema.java | 2 ++
.../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +-
.../test/org/apache/sis/xml/bind/gco/MultiplicityTest.java | 2 +-
.../test/org/apache/sis/xml/bind/lan/PT_LocaleTest.java | 2 +-
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 4 ++--
.../test/org/apache/sis/xml/test/TestCase.java | 2 +-
.../test/org/apache/sis/geometry/GeneralEnvelopeTest.java | 2 +-
.../test/org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 2 +-
.../test/org/apache/sis/referencing/GeodeticCalculatorTest.java | 4 ++--
.../apache/sis/referencing/factory/GeodeticObjectFactoryTest.java | 2 +-
.../test/org/apache/sis/referencing/factory/TestFactorySource.java | 2 ++
.../sis/referencing/operation/CoordinateOperationFinderTest.java | 2 +-
.../sis/referencing/operation/CoordinateOperationRegistryTest.java | 2 +-
.../operation/DefaultCoordinateOperationFactoryTest.java | 2 +-
.../apache/sis/referencing/operation/builder/LinearizerTest.java | 4 +++-
.../referencing/operation/builder/LocalizationGridBuilderTest.java | 2 +-
.../referencing/operation/projection/ConformalProjectionTest.java | 2 +-
.../sis/referencing/operation/projection/MapProjectionTestCase.java | 2 +-
.../apache/sis/referencing/operation/projection/MercatorTest.java | 2 +-
.../referencing/operation/provider/CoordinateFrameRotationTest.java | 2 +-
.../referencing/operation/provider/GeocentricTranslationTest.java | 2 +-
.../sis/referencing/operation/provider/GeographicOffsetsTest.java | 2 +-
.../referencing/operation/provider/PositionVector7ParamTest.java | 2 +-
.../operation/transform/CoordinateSystemTransformTest.java | 2 +-
.../sis/referencing/operation/transform/MathTransformTestCase.java | 6 +++---
.../referencing/operation/transform/ProjectiveTransformTest.java | 6 +++---
.../org/apache/sis/test/integration/CoordinateOperationTest.java | 2 +-
.../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java | 2 +-
.../test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java | 2 +-
.../org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java | 2 +-
.../main/org/apache/sis/storage/base/LegalSymbols.java | 2 +-
.../test/org/apache/sis/storage/image/WorldFileStoreTest.java | 2 +-
.../test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java | 2 +-
.../test/org/apache/sis/test/FailureDetailsReporter.java | 2 ++
.../test/org/apache/sis/test/TestCaseWithLogs.java | 2 ++
.../test/org/apache/sis/util/collection/CacheTest.java | 2 +-
.../test/org/apache/sis/util/collection/RangeSetTest.java | 2 +-
.../test/org/apache/sis/map/SEPortrayerTest.java | 2 +-
57 files changed, 72 insertions(+), 58 deletions(-)
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
index 8bb334613c,53632953da..6636413810
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
@@@ -29,8 -29,8 +29,8 @@@ import org.apache.sis.metadata.iso.cita
import org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
- // Specific to the geoapi-3.1 and master branches:
-// Specific to the geoapi-4.0 branch:
-import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
++// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
/**
