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 a6c548a Merge branch 'geoapi-4.0' into geoapi-3.1 except the change of `LocalName` into `GenericName` in the `featureTypes` property. The old type is kept on this branch for preserving backward compatibility. add 1c04921 Update for change in GeoAPI. https://github.com/opengeospatial/geoapi/issues/31 add 7adeb94 Change serialVersionUID on AbstractIdentification in geoapi-3.1/4.0 branches but not on master. The change of serialVersionUID has been done on development branches for SIS 0.5 but has been accidentally propagated to master in the SIS 0.5 release. It is too late for changing serialVersionUID on master, so we have to change it again on geoapi-3.1/4.à branches even if the current serialVersionUID on those branches is the "right" one. We want a different serialVersionUID be [...] new c468aad Merge branch 'geoapi-4.0' into geoapi-3.1. Removal of `MathTransformFactory.fromXML(String)` since that method is still part of GeoAPI 3.x. 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: .../iso/identification/AbstractIdentification.java | 2 +- .../internal/referencing/VerticalDatumTypes.java | 22 +- .../org/apache/sis/internal/util/CodeLists.java | 28 +- ide-project/NetBeans/nbproject/build-impl.xml~ | 2128 -------------------- 4 files changed, 15 insertions(+), 2165 deletions(-) delete mode 100644 ide-project/NetBeans/nbproject/build-impl.xml~