This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
from 15c3081113 Merge branch 'geoapi-3.1'. Contains a fix needed by the CI. add 3ac45c141f Automatic post-merge reorganization of import statements. add 445620db52 Merge branch 'geoapi-4.0' into geoapi-3.1: post-merge imports organization. new 6eba4a5b2d Merge branch 'geoapi-3.1': post-merge organization of imports. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java | 2 +- .../test/org/apache/sis/feature/Assertions.java | 2 +- .../test/org/apache/sis/feature/FeatureTestCase.java | 2 +- .../apache/sis/feature/builder/CharacteristicTypeBuilderTest.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 +- .../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java | 2 +- .../org/apache/sis/metadata/iso/extent/DefaultExtentTest.java | 2 +- .../iso/identification/DefaultServiceIdentificationTest.java | 2 +- .../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/referencing/GeodeticCalculatorTest.java | 1 + .../org/apache/sis/referencing/factory/TestFactorySource.java | 2 ++ .../sis/referencing/operation/CoordinateOperationFinderTest.java | 2 +- .../referencing/operation/CoordinateOperationRegistryTest.java | 2 +- .../operation/DefaultCoordinateOperationFactoryTest.java | 2 +- .../operation/builder/LocalizationGridBuilderTest.java | 2 +- .../referencing/operation/projection/ConformalProjectionTest.java | 2 +- .../referencing/operation/projection/MapProjectionTestCase.java | 2 +- .../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 +- .../referencing/operation/transform/MathTransformTestCase.java | 6 +++--- .../referencing/operation/transform/ProjectiveTransformTest.java | 8 ++++---- .../org/apache/sis/test/integration/CoordinateOperationTest.java | 2 +- .../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java | 2 +- .../org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java | 2 +- .../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/GeoapiAssert.java | 3 ++- .../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 +- 49 files changed, 61 insertions(+), 49 deletions(-)