This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
from f173cc01f5 Merge branch 'geoapi-4.0' into geoapi-3.1, but without the removal of deprecated interfaces and methods. add 770e730bd6 Post-merge automatic import reorganization. new 72bf4148b1 Merge automatic import reorganization. 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: .../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +- .../test/org/apache/sis/test/mock/VerticalCRSMock.java | 2 +- .../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 8 ++++---- .../main/org/apache/sis/referencing/crs/DefaultImageCRS.java | 6 ++++-- .../main/org/apache/sis/referencing/crs/SubTypes.java | 4 +++- .../main/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java | 4 +++- .../main/org/apache/sis/referencing/cs/SubTypes.java | 4 +++- .../main/org/apache/sis/referencing/datum/DefaultImageDatum.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 2 +- .../main/org/apache/sis/referencing/datum/SubTypes.java | 2 ++ .../org/apache/sis/referencing/internal/EPSGFactoryProxy.java | 4 +++- .../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 +++- .../apache/sis/referencing/internal/EPSGFactoryProxyDatum.java | 4 +++- .../main/org/apache/sis/xml/bind/referencing/CD_ImageDatum.java | 4 +++- .../org/apache/sis/xml/bind/referencing/CS_UserDefinedCS.java | 4 +++- .../test/org/apache/sis/io/wkt/WKTParserTest.java | 4 +--- .../apache/sis/referencing/report/CoordinateReferenceSystems.java | 2 +- .../test/org/apache/sis/test/integration/MetadataTest.java | 8 ++++---- 20 files changed, 48 insertions(+), 28 deletions(-)