This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 1531118a77783109ee2a16e9b164bd64333dd704 Merge: a833e1da47 0af37a0472 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Dec 4 15:31:13 2024 +0100 Merge branch 'geoapi-4.0': automatic reorganization of imports. .../test/org/apache/sis/geometry/wrapper/jts/WrapperTest.java | 2 +- .../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java | 2 +- .../test/org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +- .../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +- .../main/org/apache/sis/storage/netcdf/base/VariableTransformer.java | 2 +- .../main/org/apache/sis/converter/DateConverter.java | 2 +- .../main/org/apache/sis/storage/gimi/GimiProvider.java | 2 +- .../main/org/apache/sis/storage/gimi/Group.java | 3 ++- .../main/org/apache/sis/storage/gimi/ResourceGrid.java | 2 +- .../main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java | 2 +- .../main/org/apache/sis/storage/gimi/ResourcePyramid.java | 4 ++-- .../main/org/apache/sis/storage/gimi/ResourceUnknown.java | 2 +- .../sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java | 2 +- .../sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java | 1 + .../apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java | 4 ++-- 15 files changed, 18 insertions(+), 16 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java index 5e15024413,4778f8975a..d19cdd135c --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java @@@ -52,9 -52,10 +52,9 @@@ import org.apache.sis.metadata.xml.Test import static org.apache.sis.test.TestUtilities.getSingleton; import static org.apache.sis.metadata.Assertions.assertTitleEquals; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.citation.CitationDate; -import org.opengis.metadata.citation.Party; -import org.opengis.metadata.citation.Responsibility; +// Specific to the main branch: - import org.opengis.util.CodeList; +import org.opengis.metadata.citation.ResponsibleParty; ++import org.opengis.util.CodeList; /**
