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 bbf98adbb86dc6275fcc2c67be78a03c9dfbac5a
Merge: 7f981c0268 290bab04b9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Aug 23 12:03:41 2023 +0200
Merge branch 'geoapi-3.1'.
This is minor cleanup.
NOTICE | 4 +-
README | 91 ---------------------
README.md | 92 ++++++++++++++++++++++
.../apache/sis/buildtools/book/package-info.java | 7 +-
.../resources/IndexedResourceCompiler.java | 2 +-
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 6 --
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../main/org/apache/sis/image/ComputedImage.java | 2 +-
.../main/org/apache/sis/image/PixelIterator.java | 6 +-
.../main/org/apache/sis/image/PlanarImage.java | 2 +-
.../main/org/apache/sis/image/TileCache.java | 2 +-
.../apache/sis/image/WritablePixelIterator.java | 2 +-
.../main/org/apache/sis/index/tree/PointTree.java | 2 +-
.../sis/internal/filter/SortByComparator.java | 4 +-
.../org/apache/sis/internal/jaxb/lan/Country.java | 2 +-
.../org/apache/sis/xml/TransformingReader.java | 2 +-
.../org/apache/sis/metadata/iso/APIVerifier.java | 4 +-
.../apache/sis/metadata/iso/api-changes.properties | 2 +-
.../sis/referencing/factory/sql/EPSGFactory.java | 2 +-
.../apache/sis/storage/landsat/LandsatStore.java | 2 +-
.../apache/sis/internal/sql/feature/Relation.java | 8 +-
.../apache/sis/internal/stream/PaginedStream.java | 2 +-
.../main/org/apache/sis/storage/Resource.java | 2 +-
.../sis/storage/aggregate/JoinFeatureSet.java | 2 +-
.../org/apache/sis/util/logging/Initializer.java | 4 +-
.../sis/util/collection/CodeListSetTest.java | 26 +++---
netbeans-project/README.md | 4 +-
netbeans-project/nbproject/project.properties | 2 +-
.../test/module-info.java | 4 +-
optional/src/org.apache.sis.gui/bundle/README | 2 +-
.../org/apache/sis/gui/coverage/GridTileCache.java | 2 +-
.../org/apache/sis/gui/coverage/GridViewSkin.java | 2 +-
.../org/apache/sis/gui/metadata/MetadataTree.java | 2 +-
.../main/org/apache/sis/gui/metadata/Section.java | 2 +-
.../sis/gui/metadata/StandardMetadataTree.java | 2 +-
.../sis/internal/gui/NonNullObjectProperty.java | 2 +-
.../org/apache/sis/internal/gui/RecentChoices.java | 2 +-
.../main/org/apache/sis/internal/setup/Wizard.java | 4 +-
parent/LicenseHeader.txt | 16 ----
39 files changed, 153 insertions(+), 175 deletions(-)
diff --cc NOTICE
index adabad6480,aedd21ff11..e8e93764f9
--- a/NOTICE
+++ b/NOTICE
@@@ -7,8 -7,8 +7,8 @@@ The Apache Software Foundation (https:/
The Javadoc contains documentation from the Open Geospatial Consortium (OGC®)
specifications (https://www.ogc.org/standards/), also known as OpenGIS.
-Apache SIS depends on GeoAPI published by OGC under Apache 2.0 license.
+Apache SIS depends on GeoAPI published by OGC under BSD-style license.
- https://www.ogc.org/ogc/software/1.0
+ https://www.ogc.org/about-ogc/policies/software-licenses/
Apache SIS depends on JSR-385 (API only) published under BSD license.
https://jcp.org/en/jsr/detail?id=385
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java
index ea0c32ac16,cf608af210..18aece49d6
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java
@@@ -530,7 -533,7 +530,7 @@@ public class JoinFeatureSet extends Agg
* Executes the given action on the next feature in the {@code
JoinFeatureSet}.
*/
@Override
- public boolean tryAdvance(final Consumer<? super AbstractFeature>
action) {
- public boolean tryAdvance(final Consumer<? super Feature> action) {
++ public boolean tryAdvance(final Consumer<? super AbstractFeature>
action) {
for (;;) {
if (mainFeature == null) {
do if (!mainIterator.tryAdvance(this)) {
