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 fba1ecf3f7a4fd0c4138d7646f62bf16ef5035f3
Merge: 18a06d459c 0a25115dc9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Oct 3 17:49:19 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
NOTICE | 10 +-
README.md | 9 +
.../buildtools/coding/VerifyVersionInJavadoc.java | 293 +++++++++++++++++++++
.../apache/sis/buildtools/gradle/BuildHelper.java | 1 +
.../apache/sis/buildtools/gradle/ZipWriter.java | 7 +-
endorsed/README.md | 15 ++
endorsed/build.gradle.kts | 2 +
.../org.apache.sis.console/main/module-info.java | 18 +-
.../apache/sis/metadata/sql/MetadataSource.java | 2 +-
.../apache/sis/metadata/sql/util/Initializer.java | 6 +-
.../sis/metadata/sql/util/LocalDataSource.java | 2 +-
.../src/org.apache.sis.openoffice/bundle/README.md | 2 +-
.../referencing/factory/FactoryDataException.java | 5 +-
.../factory/MissingFactoryResourceException.java | 1 +
.../sis/referencing/factory/sql/EPSGFactory.java | 4 +-
.../sis/referencing/factory/sql/EPSG_README.md | 2 +-
.../sis/referencing/factory/sql/package-info.java | 2 +-
.../operation/provider/DatumShiftGridLoader.java | 3 +-
.../sis/referencing/factory/sql/epsg/README.md | 4 +-
.../sis/referencing/report/HTMLGenerator.java | 2 +-
.../src/org.apache.sis.util/main/module-info.java | 2 +-
.../main/org/apache/sis/setup/Configuration.java | 2 +-
.../apache/sis/setup/InstallationResources.java | 4 +-
.../apache/sis/setup/OptionalInstallations.java | 4 +-
incubator/README.md | 10 +
optional/README.md | 29 ++
optional/build.gradle.kts | 5 +
optional/src/org.apache.sis.gui/bundle/README | 7 +-
optional/src/org.apache.sis.gui/bundle/lib/README | 1 +
.../src/org.apache.sis.gui/main/module-info.java | 26 +-
30 files changed, 433 insertions(+), 47 deletions(-)
diff --cc endorsed/src/org.apache.sis.openoffice/bundle/README.md
index 39993eeb62,acc06e2ae7..e21a6980b6
--- a/endorsed/src/org.apache.sis.openoffice/bundle/README.md
+++ b/endorsed/src/org.apache.sis.openoffice/bundle/README.md
@@@ -83,7 -83,7 +83,7 @@@ Launch
```
cd target
- unopkg add apache-sis-1.1-SNAPSHOT.oxt --log-file log.txt
-unopkg add apache-sis-2.0-SNAPSHOT.oxt --log-file log.txt
++unopkg add apache-sis-1.x-SNAPSHOT.oxt --log-file log.txt
scalc -env:RTL_LOGFILE=log.txt
```
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/README.md
index 73d583a49e,42f030d594..6a90fc4e0b
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/README.md
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/README.md
@@@ -98,7 -98,7 +98,7 @@@ cd _<path to SIS project directory>
mvn clean install
export
CLASSPATH=~/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH
--export
CLASSPATH=$PWD/target/binaries/sis-referencing-2.0-SNAPSHOT.jar:$CLASSPATH
++export
CLASSPATH=$PWD/target/binaries/sis-referencing-1.x-SNAPSHOT.jar:$CLASSPATH
export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH
export CLASSPATH=$PWD/core/sis-referencing/target/test-classes:$CLASSPATH
cd <path to local copy of http://svn.apache.org/repos/asf/sis/data/non-free/>
