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 9cee4111e1 Merge branch 'geoapi-3.1'. add e5ffa1ff25 Post-merge automatic import reorganization. add 24e0c1b0b0 Merge branch 'geoapi-4.0' into geoapi-3.1: post-merge reorganization of imports. new 2a51813d48 Merge branch 'geoapi-3.1': Post-merge reorganization of import statements. 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: .../main/org/apache/sis/feature/FeatureType.java | 1 - .../main/org/apache/sis/feature/Property.java | 1 - .../main/org/apache/sis/filter/Expression.java | 1 - .../org.apache.sis.feature/main/org/apache/sis/filter/Filter.java | 1 - .../main/org/apache/sis/filter/FilterLiteral.java | 1 - .../apache/sis/pending/geoapi/filter/BetweenComparisonOperator.java | 1 - .../apache/sis/pending/geoapi/filter/BinaryComparisonOperator.java | 1 - .../org/apache/sis/pending/geoapi/filter/FilterExpressions.java | 1 - .../main/org/apache/sis/pending/geoapi/filter/Literal.java | 1 - .../main/org/apache/sis/pending/geoapi/filter/LogicalOperator.java | 1 - .../main/org/apache/sis/pending/geoapi/filter/Name.java | 1 - .../main/org/apache/sis/pending/geoapi/filter/SortBy.java | 1 - .../main/org/apache/sis/pending/geoapi/filter/SortProperty.java | 1 - .../main/org/apache/sis/pending/geoapi/filter/ValueReference.java | 1 - .../main/org/apache/sis/metadata/iso/OnlineResourceAdapter.java | 1 - .../main/org/apache/sis/metadata/iso/URIStringAdapter.java | 1 - .../apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java | 1 - .../org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java | 1 - .../org/apache/sis/metadata/iso/maintenance/LegacyFeatureType.java | 1 - .../main/org/apache/sis/pending/geoapi/evolution/Interim.java | 1 - .../main/org/apache/sis/pending/geoapi/evolution/InterimType.java | 1 - .../apache/sis/pending/geoapi/evolution/UnsupportedCodeList.java | 1 - .../sis/pending/geoapi/evolution/UnsupportedCodeListAdapter.java | 1 - .../sis/referencing/gazetteer/ModifiableLocationTypeAdapter.java | 1 - .../main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java | 6 +++--- .../main/org/apache/sis/referencing/crs/ParametricCRS.java | 1 - .../sis/referencing/operation/transform/ConcatenatedTransform.java | 2 +- .../main/org/apache/sis/referencing/util/ReferencingUtilities.java | 4 +++- .../operation/projection/ParameterizedTransformTestMock.java | 3 ++- .../sis/referencing/operation/transform/TransformTestCase.java | 3 ++- .../test/org/apache/sis/storage/netcdf/base/TestData.java | 3 ++- .../main/org/apache/sis/pending/geoapi/temporal/Instant.java | 1 - .../main/org/apache/sis/pending/geoapi/temporal/Period.java | 1 - .../main/org/apache/sis/pending/geoapi/temporal/PeriodDuration.java | 1 - .../main/org/apache/sis/pending/geoapi/temporal/Position.java | 1 - .../org/apache/sis/pending/geoapi/temporal/TemporalFactory.java | 1 - .../test/org/apache/sis/test/ContentVerifier.java | 3 ++- .../org.apache.sis.util/test/org/apache/sis/test/GeoapiAssert.java | 3 ++- 38 files changed, 17 insertions(+), 40 deletions(-)