This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 527f492eb1d18b3858645d2ad9bab38dd0e1fad1
Merge: 0bfd1e6 5703473
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Sep 29 19:00:00 2021 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1

 .../main/java/org/apache/sis/internal/map/ExceptionPresentation.java  | 4 ++--
 .../src/main/java/org/apache/sis/internal/map/ListChangeEvent.java    | 2 ++
 .../src/main/java/org/apache/sis/internal/map/NotifiedList.java       | 2 ++
 .../src/main/java/org/apache/sis/internal/map/Presentation.java       | 4 ++--
 .../main/java/org/apache/sis/internal/map/PropertyNameCollector.java  | 4 ++--
 .../src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java | 4 ++--
 .../src/main/java/org/apache/sis/internal/map/SEPortrayer.java        | 4 ++--
 .../src/main/java/org/apache/sis/internal/map/SEPresentation.java     | 4 ++--
 .../src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java   | 4 ++--
 .../src/main/java/org/apache/sis/internal/map/package-info.java       | 4 ++--
 .../sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java | 4 ++--
 .../src/main/java/org/apache/sis/portrayal/MapLayer.java              | 4 ++--
 .../src/main/java/org/apache/sis/portrayal/MapLayers.java             | 4 ++--
 .../apache/sis/internal/{simple => util}/SimpleCharacterIterator.java | 2 +-
 .../main/java/org/apache/sis/measure/FormattedCharacterIterator.java  | 2 +-
 .../java/org/apache/sis/measure/FormattedCharacterIteratorTest.java   | 2 +-
 .../java/org/apache/sis/storage/WritableGridCoverageResource.java     | 4 ++--
 17 files changed, 31 insertions(+), 27 deletions(-)

Reply via email to