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 2596723a0ba2b246587bfacfc93cd9cc8997a8f5
Merge: 2ce512f85a d4fc457a24
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Oct 6 02:10:17 2023 +0200
Merge branch 'geoapi-3.1'
.../org/apache/sis/buildtools/gradle/BuildHelper.java | 1 +
.../org/apache/sis/buildtools/gradle/Conventions.java | 5 +++++
.../apache/sis/buildtools/gradle/ModularJavadoc.java | 1 +
.../apache/sis/buildtools/gradle/ModularSources.java | 7 +------
endorsed/build.gradle.kts | 17 +++++++++++++++++
.../src/org.apache.sis.metadata/main/module-info.java | 3 ++-
endorsed/src/org.apache.sis.util/main/module-info.java | 11 ++++++++---
incubator/build.gradle.kts | 17 +++++++++++++++++
optional/build.gradle.kts | 17 +++++++++++++++++
settings.gradle.kts | 1 +
10 files changed, 70 insertions(+), 10 deletions(-)
diff --cc
buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
index 6d2f01949d,1e89ccf257..24e358113c
---
a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
+++
b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularJavadoc.java
@@@ -69,7 -69,8 +69,8 @@@ final class ModularJavadoc extends Conv
"todo:a:\"TODO:\"");
options.links(
"https://docs.oracle.com/en/java/javase/11/docs/api";,
- "http://www.geoapi.org/snapshot/javadoc";,
+ "http://www.geoapi.org/3.0/javadoc";,
+ "https://openjfx.io/javadoc/21/";,
"http://unitsofmeasurement.github.io/unit-api/site/apidocs";);
/*
* Taglet defined in this `buildSrc` sub-project.
diff --cc settings.gradle.kts
index f5dd152e4a,71a8d48fc6..b35086ca0c
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@@ -38,7 -39,9 +38,8 @@@ dependencyResolutionManagement
*/
repositories {
mavenCentral()
- mavenLocal() // For GeoAPI SNAPSHOT only, which are built
locally.
maven {
+ name = "UCAR"
url =
uri("https://artifacts.unidata.ucar.edu/repository/unidata-releases";)
content {
includeGroup("edu.ucar") // Restrict usage to those
dependencies.
