[sis-site] branch main updated: Add instruction about Maven deployment (for the parent POM).
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-site.git The following commit(s) were added to refs/heads/main by this push: new 78d55766 Add instruction about Maven deployment (for the parent POM). 78d55766 is described below commit 78d557662ebeb692678dfd460c9b1993522918ef Author: Martin Desruisseaux AuthorDate: Fri Oct 6 02:13:34 2023 +0200 Add instruction about Maven deployment (for the parent POM). --- content/release-management.md | 30 -- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/content/release-management.md b/content/release-management.md index 0e261a64..6ac4fab4 100644 --- a/content/release-management.md +++ b/content/release-management.md @@ -173,6 +173,24 @@ asfNexusPassword= {{< / highlight >}} +## Maven configuration + +Edit the `~/.m2/setting.xml` file, making sure that the following fragments are present. +Note that the [password can be enctypted](https://maven.apache.org/guides/mini/guide-encryption.html). + +{{< highlight xml >}} + + + + apache.releases.https + login for uploding to Maven Central + password for uploading to Maven Central + + + +{{< / highlight >}} + + # Configure{#configure} For all instructions in this page, `$OLD_VERSION` and `$NEW_VERSION` stand for the version @@ -439,15 +457,19 @@ git commit --message "Update javadoc for SIS $NEW_VERSION." This section publish artifacts to the staging repository. + ### Stage the parent POM Execute the following: {{< highlight bash >}} cd $SIS_RC_DIR/parent -mvn install deploy +mvn clean install deploy --activate-profiles apache-release {{< / highlight >}} +Connect to the [Nexus repository][repository], select the staging repository, +navigate to the `parent` sub-directory, and delete all `parent-*-source-release.zip` files. + ### Stage the project arfifacts @@ -461,13 +483,17 @@ git status # Make sure that everything is clean. gradle clean gradle test --system-prop org.apache.sis.test.extensive=true gradle assemble -gradle assemble --system-prop org.apache.sis.releaseVersion=$NEW_VERSION --rerun +rm endorsed/build/docs/*# For forcing a rerun. +gradle assemble --system-prop org.apache.sis.releaseVersion=$NEW_VERSION gradle publishToMavenLocal --system-prop org.apache.sis.releaseVersion=$NEW_VERSION ll ~/.m2/repository/org/apache/sis/core/sis-referencing/$NEW_VERSION find ~/.m2/repository/org/apache/sis -name "sis-*-$NEW_VERSION-*.asc" -exec gpg --verify '{}' \; + +gradle publish --system-prop org.apache.sis.releaseVersion=$NEW_VERSION {{< / highlight >}} + ### Stage the non-free resources{#maven-nonfree} Go to the directory that contains a checkout of `https://svn.apache.org/repos/asf/sis/data/non-free/sis-epsg`.
[sis] branch main updated (2ce512f85a -> 2596723a0b)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 2ce512f85a Fix more Javadoc errors. add 7e10eef9d5 Fixes to the build plugin based on release experience. add 0c022f2f1f Define Maven repositories for snapshots and release deployments. add a24a7b212f Add qualified exports needed by the "non-free" optional modules for EPSG data. add d4fc457a24 Merge branch 'geoapi-4.0' into geoapi-3.1 new 2596723a0b Merge branch 'geoapi-3.1' 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: .../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(-)
[sis] 01/01: Merge branch 'geoapi-3.1'
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 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.
[sis] branch geoapi-3.1 updated (2730c89d63 -> d4fc457a24)
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 2730c89d63 Merge branch 'geoapi-4.0' into geoapi-3.1 add 7e10eef9d5 Fixes to the build plugin based on release experience. add 0c022f2f1f Define Maven repositories for snapshots and release deployments. add a24a7b212f Add qualified exports needed by the "non-free" optional modules for EPSG data. new d4fc457a24 Merge branch 'geoapi-4.0' into geoapi-3.1 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: .../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(-)
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 d4fc457a24f10d906d2ef8f34267730d895e60e7 Merge: 2730c89d63 a24a7b212f Author: Martin Desruisseaux AuthorDate: Fri Oct 6 02:04:50 2023 +0200 Merge branch 'geoapi-4.0' into 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(-)
[sis] branch geoapi-4.0 updated: Add qualified exports needed by the "non-free" optional modules for EPSG data.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new a24a7b212f Add qualified exports needed by the "non-free" optional modules for EPSG data. a24a7b212f is described below commit a24a7b212fae60c4257b54be0d3da15b3f57dc56 Author: Martin Desruisseaux AuthorDate: Fri Oct 6 02:03:32 2023 +0200 Add qualified exports needed by the "non-free" optional modules for EPSG data. --- endorsed/src/org.apache.sis.metadata/main/module-info.java | 3 ++- endorsed/src/org.apache.sis.util/main/module-info.java | 11 --- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/endorsed/src/org.apache.sis.metadata/main/module-info.java b/endorsed/src/org.apache.sis.metadata/main/module-info.java index d9a14d16c5..6975678255 100644 --- a/endorsed/src/org.apache.sis.metadata/main/module-info.java +++ b/endorsed/src/org.apache.sis.metadata/main/module-info.java @@ -149,7 +149,8 @@ module org.apache.sis.metadata { exports org.apache.sis.metadata.sql.util to org.apache.sis.referencing, -org.apache.sis.storage.sql; +org.apache.sis.storage.sql, +org.apache.sis.referencing.database; exports org.apache.sis.metadata.simple to org.apache.sis.referencing, diff --git a/endorsed/src/org.apache.sis.util/main/module-info.java b/endorsed/src/org.apache.sis.util/main/module-info.java index 34ebd8ec24..60dfbff8cd 100644 --- a/endorsed/src/org.apache.sis.util/main/module-info.java +++ b/endorsed/src/org.apache.sis.util/main/module-info.java @@ -112,7 +112,9 @@ module org.apache.sis.util { org.apache.sis.cloud.aws, org.apache.sis.console, org.apache.sis.openoffice, -org.apache.sis.gui; // In the "optional" sub-project. +org.apache.sis.gui, // In the "optional" sub-project. +org.apache.sis.referencing.epsg, +org.apache.sis.referencing.database; exports org.apache.sis.util.internal to org.apache.sis.metadata, @@ -129,7 +131,9 @@ module org.apache.sis.util { org.apache.sis.portrayal, org.apache.sis.cloud.aws, org.apache.sis.console, -org.apache.sis.gui; // In the "optional" sub-project. +org.apache.sis.gui, // In the "optional" sub-project. +org.apache.sis.referencing.epsg, +org.apache.sis.referencing.database; exports org.apache.sis.pending.temporal to org.apache.sis.metadata; @@ -155,7 +159,8 @@ module org.apache.sis.util { org.apache.sis.portrayal, org.apache.sis.console, org.apache.sis.webapp, // In the "incubator" sub-project. -org.apache.sis.gui; // In the "optional" sub-project. +org.apache.sis.gui, // In the "optional" sub-project. +org.apache.sis.referencing.database; exports org.apache.sis.pending.jdk to org.apache.sis.feature,
svn commit: r1912761 - in /sis/data/non-free: sis-embedded-data/ sis-embedded-data/src/main/java/ sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/ sis-embedded-data/src/test/java/org
Author: desruisseaux Date: Thu Oct 5 23:59:42 2023 New Revision: 1912761 URL: http://svn.apache.org/viewvc?rev=1912761=rev Log: Add `module-info.java` files. Added: sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak sis/data/non-free/sis-epsg/src/main/java/module-info.java Modified: sis/data/non-free/sis-embedded-data/pom.xml sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/package-info.java sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java sis/data/non-free/sis-epsg/pom.xml sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java Modified: sis/data/non-free/sis-embedded-data/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/pom.xml?rev=1912761=1912760=1912761=diff == --- sis/data/non-free/sis-embedded-data/pom.xml (original) +++ sis/data/non-free/sis-embedded-data/pom.xml Thu Oct 5 23:59:42 2023 @@ -136,7 +136,7 @@ Provides non-free data, including the EP maven-jar-plugin -**/Generator* +**/Generator* Added: sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak?rev=1912761=auto == --- sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak (added) +++ sis/data/non-free/sis-embedded-data/src/main/java/module-info.bak Thu Oct 5 23:59:42 2023 @@ -0,0 +1,29 @@ +TODO: Not yet working, as Derby seems to not find the database anymore. + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +module org.apache.sis.referencing.database { +requires transitive org.opengis.geoapi; +requires transitive org.apache.sis.referencing; +requiresorg.apache.derby.tools; + +exports org.apache.sis.resources.embedded; + +uses org.apache.sis.setup.InstallationResources; +provides org.apache.sis.setup.InstallationResources +with org.apache.sis.resources.embedded.EmbeddedResources; +} Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java?rev=1912761=1912760=1912761=diff == --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] Thu Oct 5 23:59:42 2023 @@ -36,7 +36,7 @@ import org.apache.sis.util.resources.Err * which should be accepted by users before the EPSG dataset can be installed. * * @author Martin Desruisseaux (Geomatys) - * @version 0.8 + * @version 1.4 * @since 0.8 * * @see https://www.epsg.org/;>https://www.epsg.org/ Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java?rev=1912761=1912760=1912761=diff == --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] Thu Oct 5 23:59:42 2023 @@ -59,8
[sis] branch geoapi-4.0 updated (24b12731b9 -> 0c022f2f1f)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from 24b12731b9 Add GPG signing for endorsed and optional modules. Incubator modules are not signed because not intended to be released. new 7e10eef9d5 Fixes to the build plugin based on release experience. new 0c022f2f1f Define Maven repositories for snapshots and release deployments. The 2 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: .../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 + incubator/build.gradle.kts | 17 + optional/build.gradle.kts | 17 + settings.gradle.kts | 1 + 8 files changed, 60 insertions(+), 6 deletions(-)
[sis] 02/02: Define Maven repositories for snapshots and release deployments.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git commit 0c022f2f1f71fc4fdac2d0e1a63d57cc9490a157 Author: Martin Desruisseaux AuthorDate: Fri Sep 15 15:25:06 2023 +0200 Define Maven repositories for snapshots and release deployments. --- endorsed/build.gradle.kts | 17 + incubator/build.gradle.kts | 17 + optional/build.gradle.kts | 17 + settings.gradle.kts| 1 + 4 files changed, 52 insertions(+) diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts index c4806ce7ed..abf77b66cc 100644 --- a/endorsed/build.gradle.kts +++ b/endorsed/build.gradle.kts @@ -444,6 +444,23 @@ publishing { } } } +/* Following block is currently repeated in all sub-projects. */ +repositories { +maven { +name = "Apache" +url = uri(if (version.toString().endsWith("SNAPSHOT")) + "https://repository.apache.org/content/repositories/snapshots; else + "https://repository.apache.org/service/local/staging/deploy/maven2;) +credentials { +val asfNexusUsername = providers.gradleProperty("asfNexusUsername") +val asfNexusPassword = providers.gradleProperty("asfNexusPassword") +if (asfNexusUsername.isPresent() && asfNexusPassword.isPresent()) { +username = asfNexusUsername.get() +password = asfNexusPassword.get() +} +} +} +} } signing { diff --git a/incubator/build.gradle.kts b/incubator/build.gradle.kts index e2e76b96bd..b2a0c48eb0 100644 --- a/incubator/build.gradle.kts +++ b/incubator/build.gradle.kts @@ -151,4 +151,21 @@ publishing { } } } +/* Following block is currently repeated in all sub-projects. */ +repositories { +maven { +name = "Apache" +url = uri(if (version.toString().endsWith("SNAPSHOT")) + "https://repository.apache.org/content/repositories/snapshots; else + "https://repository.apache.org/service/local/staging/deploy/maven2;) +credentials { +val asfNexusUsername = providers.gradleProperty("asfNexusUsername") +val asfNexusPassword = providers.gradleProperty("asfNexusPassword") +if (asfNexusUsername.isPresent() && asfNexusPassword.isPresent()) { +username = asfNexusUsername.get() +password = asfNexusPassword.get() +} +} +} +} } diff --git a/optional/build.gradle.kts b/optional/build.gradle.kts index a96990dfa5..a819cfed16 100644 --- a/optional/build.gradle.kts +++ b/optional/build.gradle.kts @@ -175,6 +175,23 @@ publishing { } } } +/* Following block is currently repeated in all sub-projects. */ +repositories { +maven { +name = "Apache" +url = uri(if (version.toString().endsWith("SNAPSHOT")) + "https://repository.apache.org/content/repositories/snapshots; else + "https://repository.apache.org/service/local/staging/deploy/maven2;) +credentials { +val asfNexusUsername = providers.gradleProperty("asfNexusUsername") +val asfNexusPassword = providers.gradleProperty("asfNexusPassword") +if (asfNexusUsername.isPresent() && asfNexusPassword.isPresent()) { +username = asfNexusUsername.get() +password = asfNexusPassword.get() +} +} +} +} } signing { diff --git a/settings.gradle.kts b/settings.gradle.kts index 6f5cf90996..c938ca4576 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -41,6 +41,7 @@ dependencyResolutionManagement { 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.
[sis] 01/02: Fixes to the build plugin based on release experience.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git commit 7e10eef9d532c0ea8b9b08858ea6aff30acca36a Author: Martin Desruisseaux AuthorDate: Thu Oct 5 21:17:07 2023 +0200 Fixes to the build plugin based on release experience. --- .../main/org/apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../main/org/apache/sis/buildtools/gradle/Conventions.java | 5 + .../main/org/apache/sis/buildtools/gradle/ModularJavadoc.java | 1 + .../main/org/apache/sis/buildtools/gradle/ModularSources.java | 7 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java index 0408b27a8f..7dd86924e3 100644 --- a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java +++ b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/BuildHelper.java @@ -162,6 +162,7 @@ public final class BuildHelper implements Plugin { tasks.withType(Jar.class).forEach((task) -> { task.getInputs().dir(Conventions.SOURCE_DIRECTORY); task.getOutputs().dir(Conventions.fileRelativeToBuild(project, Conventions.LIBS_DIRECTORY)); +task.getOutputs().dir(Conventions.fileRelativeToBuild(project, Conventions.DOCS_DIRECTORY)); task.setActions(List.of((t) -> {// Replace the default action by our own. ModularJAR.execute(BuildHelper.this, (Jar) t); })); diff --git a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Conventions.java b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Conventions.java index c50dbefa95..471f16d67c 100644 --- a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Conventions.java +++ b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/Conventions.java @@ -80,6 +80,11 @@ abstract class Conventions { */ static final String LIBS_DIRECTORY = "libs"; +/** + * The sub-directory inside "{@value #BUILD_DIRECTORY}" for the Javadoc and sources ZIP files. + */ +static final String DOCS_DIRECTORY = "docs"; + /** * The sub-directory inside "{@value #BUILD_DIRECTORY}" for the ZIP or OXT files (assemblies). * Also the sibling directory of "{@value #MAIN_DIRECTORY}" and "{@value #TEST_DIRECTORY}" diff --git 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 index 63e917813a..1e89ccf257 100644 --- 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 @@ -70,6 +70,7 @@ final class ModularJavadoc extends Conventions { options.links( "https://docs.oracle.com/en/java/javase/11/docs/api;, "http://www.geoapi.org/snapshot/javadoc;, +"https://openjfx.io/javadoc/21/;, "http://unitsofmeasurement.github.io/unit-api/site/apidocs;); /* * Taglet defined in this `buildSrc` sub-project. diff --git a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java index 9525b4f796..d330d6a9e5 100644 --- a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java +++ b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java @@ -31,11 +31,6 @@ import org.gradle.api.Task; * @author Martin Desruisseaux (Geomatys) */ final class ModularSources extends ZipWriter.JDK { -/** - * The directory where the ZIP files will be written. - */ -private static final String OUTPUT_DIRECTORY = "docs"; - /** * The Java system property to set to {@code true} for enabling Javadoc generation. */ @@ -136,7 +131,7 @@ final class ModularSources extends ZipWriter.JDK { } else { sources = sourcesDir(project, module); } -final var target = Conventions.fileRelativeToBuild(project, OUTPUT_DIRECTORY); +final var target = Conventions.fileRelativeToBuild(project, Conventions.DOCS_DIRECTORY); target.mkdir(); final File file = new File(target, module + '-' + (javadoc ? "javadoc" : "sources") + ".jar"); try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))) {
svn commit: r1912760 - in /sis/data/non-free: ./ sis-embedded-data/ sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/ sis-embedded-data/src/test/java/org/apache/sis/resources/embedded
Author: desruisseaux Date: Thu Oct 5 23:21:19 2023 New Revision: 1912760 URL: http://svn.apache.org/viewvc?rev=1912760=rev Log: Upgrade to Apache SIS 1.4. Removed: sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedDataTestSuite.java sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/EpsgTestSuite.java Modified: sis/data/non-free/pom.xml sis/data/non-free/sis-embedded-data/pom.xml sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java sis/data/non-free/sis-epsg/pom.xml sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java Modified: sis/data/non-free/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1912760=1912759=1912760=diff == --- sis/data/non-free/pom.xml (original) +++ sis/data/non-free/pom.xml Thu Oct 5 23:21:19 2023 @@ -27,7 +27,7 @@ org.apache.sis parent -1.3 +1.4 @@ -95,12 +95,7 @@ The "non-free" modules contain data that org.opengis geoapi-conformance - - - org.apache.sis.core - sis-utility - ${project.version} - test-jar + 3.0.2 test Modified: sis/data/non-free/sis-embedded-data/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/pom.xml?rev=1912760=1912759=1912760=diff == --- sis/data/non-free/sis-embedded-data/pom.xml (original) +++ sis/data/non-free/sis-embedded-data/pom.xml Thu Oct 5 23:21:19 2023 @@ -27,7 +27,7 @@ org.apache.sis non-free -1.3 +1.4 @@ -84,6 +84,13 @@ Provides non-free data, including the EP org.apache.derby derby + 10.15.2.0 + compile + + + org.apache.derby + derbytools + 10.15.2.0 compile Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java?rev=1912760=1912759=1912760=diff == --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] Thu Oct 5 23:21:19 2023 @@ -24,8 +24,8 @@ import java.io.InputStreamReader; import java.io.IOException; import javax.sql.DataSource; import org.apache.derby.jdbc.EmbeddedDataSource; -import org.apache.sis.internal.util.MetadataServices; -import org.apache.sis.internal.metadata.sql.Initializer; +import org.apache.sis.util.internal.MetadataServices; +import org.apache.sis.metadata.sql.util.Initializer; import org.apache.sis.setup.InstallationResources; import org.apache.sis.util.resources.Errors; Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java?rev=1912760=1912759=1912760=diff == --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] Thu Oct 5 23:21:19 2023 @@ -37,10 +37,10 @@ import java.sql.SQLException; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.GeographicCRS; import org.apache.derby.jdbc.EmbeddedDataSource; -import org.apache.sis.internal.metadata.sql.Initializer; -import org.apache.sis.internal.metadata.sql.LocalDataSource; -import org.apache.sis.internal.system.Shutdown; -import org.apache.sis.internal.util.Constants; +import org.apache.sis.metadata.sql.util.Initializer; +import org.apache.sis.metadata.sql.util.LocalDataSource; +import org.apache.sis.system.Shutdown; +import org.apache.sis.util.internal.Constants; import org.apache.sis.metadata.MetadataStandard; import org.apache.sis.metadata.sql.MetadataSource; import org.apache.sis.metadata.sql.MetadataStoreException; Modified:
[sis-site] branch main updated: Partial update of release management notes, with more instruction about publishing.
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-site.git The following commit(s) were added to refs/heads/main by this push: new e173b3eb Partial update of release management notes, with more instruction about publishing. e173b3eb is described below commit e173b3ebe551eb99faeae83fce8232546226ce03 Author: Martin Desruisseaux AuthorDate: Thu Oct 5 21:56:17 2023 +0200 Partial update of release management notes, with more instruction about publishing. --- content/release-management.md | 173 -- 1 file changed, 117 insertions(+), 56 deletions(-) diff --git a/content/release-management.md b/content/release-management.md index fefc147a..0e261a64 100644 --- a/content/release-management.md +++ b/content/release-management.md @@ -161,6 +161,18 @@ Then, the signed public key shall be appended to the `KEYS` file on the [SIS sou then copied to the [SIS distribution directory][dist]. +## Gradle configuration + +Edit the `~/.gradle/gradle.properties` file, making sure that the following properties are present: + +{{< highlight text >}} +org.gradle.java.home= +signing.gnupg.keyName= +asfNexusUsername= +asfNexusPassword= +{{< / highlight >}} + + # Configure{#configure} For all instructions in this page, `$OLD_VERSION` and `$NEW_VERSION` stand for the version @@ -292,7 +304,7 @@ git commit --message "Release notes for Apache SIS $NEW_VERSION." {{< / highlight >}} -# Create release branch{#branch} +# Create release artifacts{#create-artifacts} Execute the following commands. It is okay to checkout the branch in a separated directory if desired. @@ -340,48 +352,123 @@ gradle test git commit --message="Set version number to $NEW_VERSION." {{< / highlight >}} + +## Initialize the distribution directory{#dist} + +Create the directory for the new version and release candidate within the distribution directory. +The `$RELEASE_CANDIDATE` variable shall be the number of current release attempt. + +{{< highlight bash >}} +cd ../release/distribution +svn update +mkdir -p $NEW_VERSION/RC$RELEASE_CANDIDATE +svn add $NEW_VERSION +cd $NEW_VERSION/RC$RELEASE_CANDIDATE +export DIST_DIR=`pwd` +{{< / highlight >}} + +Copy the `HEADER.html` file from the previous release. +Update the file content if necessary. + +{{< highlight bash >}} +svn copy https://dist.apache.org/repos/dist/release/sis/$OLD_VERSION/HEADER.html . +{{< / highlight >}} + + ## Generate Javadoc{#javadoc} -Execute the following commands. The first one (`gradle javadoc`) will fail. -This is a known problem with the current build. -Open `javadoc.options` file as below (`gedit` can be replaced by another editor), -and move all `-classpath` content to `--module-path`. -Then launch Javadoc from the command-line: +Execute `gradle javadoc`. That command will fail. This is a known problem with the current Gradle build configuration. +But it should have created a `javadoc.options` file that we will patch as below (`gedit` can be replaced by another editor): {{< highlight bash >}} -gradle javadoc +cd $SIS_RC_DIR +gradle javadoc # Fail. See workaround below. gedit endorsed/build/tmp/javadoc/javadoc.options +{{< / highlight >}} + +Apply the following changes: + +* Move all `-classpath` content to `--module-path`. +* Add the value of `$PATH_TO_FX` environment variable to the module-path. +* Delete all Java source files listed after the options, everything until the end of file. +* Add the following line in-place of deleted lines (omit the `org.opengis.geoapi` module if not desired): + +{{< highlight text >}} +--module org.opengis.geoapi,org.apache.sis.util,org.apache.sis.metadata,org.apache.sis.referencing,org.apache.sis.referencing.gazetteer,org.apache.sis.feature,org.apache.sis.storage,org.apache.sis.storage.sql,org.apache.sis.storage.xml,org.apache.sis.storage.netcdf,org.apache.sis.storage.geotiff,org.apache.sis.storage.earthobservation,org.apache.sis.cloud.aws,org.apache.sis.portrayal,org.apache.sis.profile.france,org.apache.sis.profile.japan,org.apache.sis.openoffice,org.apache.sis.conso [...] +{{< / highlight >}} + +The following commands temporarily create links to optional modules for inclusion in the Javadoc. +The GeoAPI interfaces may also be copied if they should be bundled with the Javadoc. +Then the Javadoc command is launched manually. + +{{< highlight bash >}} +cd endorsed/src +ln -s ../../optional/src/org.apache.sis.gui +cd - + +# Replace "../../GeoAPI/3.0.2" by the path to a GeoAPI 3.0.2 checkout, or omit those lines. +mkdir endorsed/src/org.opengis.geoapi +cp -r ../../GeoAPI/3.0.2/geoapi/src/main/java endorsed/src/org.opengis.geoapi/main +cp -r ../../GeoAPI/3.0.2/geoapi/src/pending/java/org endorsed/src/org.opengis.geoapi/main/ +cp../../GeoAPI/3.0.2/geoapi/src/main/java9/module-info.java
[sis] 03/03: Fix more Javadoc errors.
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 2ce512f85a6e66adb8645e1641e15e5c15191863 Author: Martin Desruisseaux AuthorDate: Thu Oct 5 15:43:08 2023 +0200 Fix more Javadoc errors. --- .../main/org/apache/sis/feature/AbstractFeature.java | 2 +- .../apache/sis/xml/bind/metadata/code/MD_CharacterSetCode.java | 2 +- .../main/org/apache/sis/referencing/IdentifiedObjects.java | 2 +- .../apache/sis/referencing/factory/GeodeticObjectFactory.java| 2 +- .../main/org/apache/sis/storage/FeatureQuery.java| 9 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java index 033cc8d924..fc502bf8ec 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java @@ -437,7 +437,7 @@ public abstract class AbstractFeature implements Serializable { * but the {@linkplain FeatureOperations#link link} and * {@linkplain FeatureOperations#compound compound} operations (for instances) do. * Whether an operation is writable or not depends on whether the computed {@link Property} - * supports {@link Attribute#setValue(Object)} or {@link FeatureAssociation#setValue(Feature)}. + * supports {@link AbstractAttribute#setValue(Object)} or {@link AbstractAssociation#setValue(Feature)}. * * @param name the name of the operation to execute. The caller is responsible to ensure that the *property type for that name is an instance of {@link AbstractOperation}. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_CharacterSetCode.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_CharacterSetCode.java index ff2fbfbfc0..9a7f67e7e3 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_CharacterSetCode.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/code/MD_CharacterSetCode.java @@ -109,7 +109,7 @@ public final class MD_CharacterSetCode extends XmlAdapter{@link AbstractIdentifiedObject#getDomains()} * {@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY} * {@link IdentifiedObject#getRemarks()} - * {@value org.opengis.referencing.ReferenceSystem#SCOPE_KEY + * {@value org.opengis.referencing.ReferenceSystem#SCOPE_KEY} * {@link DefaultObjectDomain#getScope()} * {@value org.opengis.referencing.ReferenceSystem#DOMAIN_OF_VALIDITY_KEY} * {@link DefaultObjectDomain#getDomainOfValidity()} diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java index d979184f3f..30b647a50c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java @@ -139,7 +139,7 @@ import org.apache.sis.xml.XML; * * {@value org.opengis.referencing.ReferenceSystem#SCOPE_KEY} * {@link String} or {@link InternationalString} - * {@link DefaultObjectDomain#getScope()} + * {@link org.apache.sis.referencing.DefaultObjectDomain#getScope()} * * {@value org.opengis.referencing.datum.Datum#ANCHOR_POINT_KEY} * {@link InternationalString} or {@link String} diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java index 9a5b59763b..1353ab3c74 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureQuery.java @@ -52,6 +52,7 @@ import org.apache.sis.util.resources.Vocabulary; import org.apache.sis.feature.AbstractFeature; import org.apache.sis.feature.DefaultFeatureType; import org.apache.sis.feature.DefaultAttributeType; +import org.apache.sis.feature.AbstractAttribute; import org.apache.sis.filter.Filter; import org.apache.sis.filter.Expression; import org.apache.sis.pending.geoapi.filter.Literal; @@ -434,7 +435,7 @@ public class FeatureQuery extends Query implements Cloneable, Serializable { /** * Whether a property evaluated by a query is computed on the fly or stored. * By default, an expression is evaluated only once for each feature instance, - *
[sis] branch main updated (00e6806277 -> 2ce512f85a)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/sis.git from 00e6806277 Replace a link to GeoAPI-snapshot by a link to GeoAPI 3.0. new d214faa29b Fix some Javadoc warnings specific to the main branch. add c847947bde Fix some Javadoc warnings. add 17c3f73eca Generate sources JAR and Javadoc JAR together with the Maven artifacts. add 24b12731b9 Add GPG signing for endorsed and optional modules. Incubator modules are not signed because not intended to be released. add 2730c89d63 Merge branch 'geoapi-4.0' into geoapi-3.1 new 161c52e539 Merge branch 'geoapi-3.1' new 2ce512f85a Fix more Javadoc errors. The 3 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: .../apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../apache/sis/buildtools/gradle/Dependency.java | 2 +- .../apache/sis/buildtools/gradle/ModularJAR.java | 9 +- .../sis/buildtools/gradle/ModularSources.java | 147 + .../apache/sis/buildtools/gradle/ZipWriter.java| 2 +- endorsed/build.gradle.kts | 109 --- .../org/apache/sis/feature/AbstractFeature.java| 6 +- .../sis/feature/internal/FeatureExpression.java| 6 +- .../main/org/apache/sis/filter/Filter.java | 2 + .../org/apache/sis/filter/sqlmm/OneGeometry.java | 2 + .../org/apache/sis/filter/sqlmm/ST_Transform.java | 2 + .../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 + .../main/org/apache/sis/util/iso/Types.java| 5 +- .../main/org/apache/sis/xml/TransformedEvent.java | 2 +- .../bind/metadata/code/MD_CharacterSetCode.java| 2 +- .../bind/metadata/replace/QualityParameter.java| 8 +- .../bind/metadata/replace/ServiceParameter.java| 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 4 +- .../apache/sis/referencing/IdentifiedObjects.java | 2 +- .../referencing/factory/GeodeticObjectFactory.java | 6 +- .../org/apache/sis/storage/sql/feature/Table.java | 2 +- .../org/apache/sis/storage/gpx/WritableStore.java | 1 - .../main/org/apache/sis/storage/FeatureQuery.java | 15 ++- .../org/apache/sis/storage/StorageConnector.java | 2 + .../org/apache/sis/storage/WritableFeatureSet.java | 1 - .../apache/sis/storage/base/MetadataBuilder.java | 2 +- .../org/apache/sis/converter/NumberConverter.java | 2 + .../org/apache/sis/converter/ObjectToString.java | 4 + .../org/apache/sis/converter/StringConverter.java | 4 + .../sis/util/collection/WeakValueHashMap.java | 2 +- .../apache/sis/util/internal/MetadataServices.java | 2 - .../apache/sis/util/internal/PropertyFormat.java | 2 +- incubator/build.gradle.kts | 10 +- optional/build.gradle.kts | 13 +- .../org/apache/sis/gui/map/ValuesFormatter.java| 2 +- 35 files changed, 323 insertions(+), 62 deletions(-) create mode 100644 buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
[sis] 02/03: Merge branch 'geoapi-3.1'
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 161c52e539145524ccc81992879d9241e0438dd8 Merge: d214faa29b 2730c89d63 Author: Martin Desruisseaux AuthorDate: Thu Oct 5 15:41:28 2023 +0200 Merge branch 'geoapi-3.1' .../apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../apache/sis/buildtools/gradle/Dependency.java | 2 +- .../apache/sis/buildtools/gradle/ModularJAR.java | 9 +- .../sis/buildtools/gradle/ModularSources.java | 147 + .../apache/sis/buildtools/gradle/ZipWriter.java| 2 +- endorsed/build.gradle.kts | 109 --- .../org/apache/sis/filter/sqlmm/OneGeometry.java | 2 + .../org/apache/sis/filter/sqlmm/ST_Transform.java | 2 + .../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 + .../main/org/apache/sis/util/iso/Types.java| 5 +- .../bind/metadata/replace/QualityParameter.java| 6 +- .../sis/referencing/AbstractIdentifiedObject.java | 4 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../org/apache/sis/storage/gpx/WritableStore.java | 1 - .../org/apache/sis/storage/StorageConnector.java | 2 + .../org/apache/sis/storage/WritableFeatureSet.java | 1 - .../org/apache/sis/converter/NumberConverter.java | 2 + .../org/apache/sis/converter/ObjectToString.java | 4 + .../org/apache/sis/converter/StringConverter.java | 4 + .../sis/util/collection/WeakValueHashMap.java | 2 +- .../apache/sis/util/internal/MetadataServices.java | 2 - incubator/build.gradle.kts | 10 +- optional/build.gradle.kts | 13 +- .../org/apache/sis/gui/map/ValuesFormatter.java| 2 +- 24 files changed, 298 insertions(+), 40 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java index c74f3dfd1d,def4612fa5..336458e1ba --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java @@@ -94,11 -97,10 +94,9 @@@ public final class QualityParameter ext /** * Description of the data quality parameter. - * - * @see #getDescription() */ @XmlElement -@SuppressWarnings("serial") // Most Apache SIS implementations are serializable. -public Description description; +public DefaultMeasureDescription description; /** * Value type of the data quality parameter (shall be one of the data types defined in ISO/TS 19103:2005). @@@ -204,6 -229,11 +202,8 @@@ * Otherwise the given class is used as if it was already a component type (i.e. a singleton item). * * - * This method is used for mapping {@link Class} to ({@link ValueStructure}, {@link TypeName}) pair. - * The other member of the pair is given by {@link ValueStructure#valueOf(Class)}. - * + * @todo {@code Coverage} case needs to be added. It would be handle like {@link Matrix}. + * * @param valueClass the type of values for which to infer a {@link TypeName} instance. * @return a type name for components of the given type. */ diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java index ad235c995f,95c4401371..d979184f3f --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java @@@ -129,9 -129,9 +129,9 @@@ import org.apache.sis.xml.XML * {@link Identifier} (optionally as array) * {@link AbstractIdentifiedObject#getIdentifiers()} * - * {@value org.opengis.referencing.IdentifiedObject#DOMAINS_KEY} - * {@link org.opengis.referencing.ObjectDomain} (optionally as array) + * "domains" + * {@link org.apache.sis.referencing.DefaultObjectDomain} (optionally as array) - * {@link #getDomains()} + * {@link AbstractIdentifiedObject#getDomains()} * * {@value org.opengis.referencing.ReferenceSystem#DOMAIN_OF_VALIDITY_KEY} * {@link Extent} diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java index 247a31c171,06ce25d8d4..ee46e96473 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java @@@ -81,10 -81,9 +81,9 @@@ public interface WritableFeatureSet ext * Removes all feature instances from this {@code FeatureSet} which matches the given predicate. * * @param filter a predicate
[sis] 01/03: Fix some Javadoc warnings specific to the main branch.
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 d214faa29b785586ab2835cefc4f693c19b99cd9 Author: Martin Desruisseaux AuthorDate: Tue Oct 3 23:46:44 2023 +0200 Fix some Javadoc warnings specific to the main branch. --- .../main/org/apache/sis/feature/AbstractFeature.java | 4 ++-- .../org/apache/sis/feature/internal/FeatureExpression.java | 6 +++--- .../main/org/apache/sis/filter/Filter.java | 2 ++ .../main/org/apache/sis/xml/TransformedEvent.java | 2 +- .../sis/xml/bind/metadata/replace/QualityParameter.java| 2 +- .../sis/xml/bind/metadata/replace/ServiceParameter.java| 2 +- .../main/org/apache/sis/storage/sql/feature/Table.java | 2 +- .../main/org/apache/sis/storage/FeatureQuery.java | 14 +++--- .../main/org/apache/sis/storage/base/MetadataBuilder.java | 2 +- .../main/org/apache/sis/util/internal/PropertyFormat.java | 2 +- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java index 6def733227..033cc8d924 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java @@ -54,8 +54,8 @@ import org.apache.sis.feature.internal.Resources; * * * Operations - * Properties that are instances of {@link Operation} are usually not stored in {@code Feature} instances. - * Instead, the {@link Operation#apply Operation.apply(…)} method is invoked every times that the property + * Properties that are instances of {@code Operation} are usually not stored in {@code Feature} instances. + * Instead, the {@link AbstractOperation#apply Operation.apply(…)} method is invoked every times that the property * value is requested. {@code AbstractFeature} does not cache operation results. * Those results are usually read-only, but may be writable under the conditions documented in * {@link #setOperationValue(String, Object)}. diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/FeatureExpression.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/FeatureExpression.java index cc2b87f3f6..05bd7e153e 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/FeatureExpression.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/FeatureExpression.java @@ -73,9 +73,9 @@ public interface FeatureExpression extends Expression { /** * Provides the expected type of values produced by this expression when a feature of the given - * type is evaluated. The resulting type shall describe a "static" property, i.e. it can be an - * {@link AttributeType} or a {@link org.opengis.feature.FeatureAssociationRole} - * but not an {@link org.opengis.feature.Operation}. + * type is evaluated. The resulting type shall describe a "static" property, i.e. it can be a + * {@link org.apache.sis.feature.DefaultAttributeType} or a {@link org.apache.sis.feature.DefaultAssociationRole} + * but not an {@link org.apache.sis.feature.AbstractOperation}. * * If this method returns an instance of {@link AttributeTypeBuilder}, then its parameterized * type should be the same {@code } than this {@code FeatureExpression}. diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Filter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Filter.java index 8676107bf7..0e11130b4f 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Filter.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Filter.java @@ -32,6 +32,8 @@ import java.util.function.Predicate; * instead of {@code org.apache.sis.filter}. * * + * @paramthe type of resources (e.g. {@link org.apache.sis.feature.AbstractFeature}) to filter. + * * @since 1.1 */ public interface Filter extends Predicate { diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformedEvent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformedEvent.java index f906873041..e86698e2c0 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformedEvent.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformedEvent.java @@ -126,7 +126,7 @@ abstract class TransformedEvent implements XMLEvent { /** * Wrapper over a namespace emitted during the reading or writing of an XML document. * This wrapper is used for changing the namespace URI. The wrapped {@link #event} - * should be a {@link Namespace}, but
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 2730c89d637c575eb52f75fa51b067a47fa40355 Merge: fba1ecf3f7 24b12731b9 Author: Martin Desruisseaux AuthorDate: Thu Oct 5 15:33:25 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../apache/sis/buildtools/gradle/Dependency.java | 2 +- .../apache/sis/buildtools/gradle/ModularJAR.java | 9 +- .../sis/buildtools/gradle/ModularSources.java | 147 + .../apache/sis/buildtools/gradle/ZipWriter.java| 2 +- endorsed/build.gradle.kts | 109 --- .../org/apache/sis/filter/sqlmm/OneGeometry.java | 2 + .../org/apache/sis/filter/sqlmm/ST_Transform.java | 2 + .../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 + .../main/org/apache/sis/util/iso/Types.java| 5 +- .../bind/metadata/replace/QualityParameter.java| 6 +- .../sis/referencing/AbstractIdentifiedObject.java | 4 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../org/apache/sis/storage/gpx/WritableStore.java | 1 - .../org/apache/sis/storage/StorageConnector.java | 2 + .../org/apache/sis/storage/WritableFeatureSet.java | 1 - .../org/apache/sis/converter/NumberConverter.java | 2 + .../org/apache/sis/converter/ObjectToString.java | 4 + .../org/apache/sis/converter/StringConverter.java | 4 + .../sis/util/collection/WeakValueHashMap.java | 2 +- .../apache/sis/util/internal/MetadataServices.java | 2 - incubator/build.gradle.kts | 15 ++- optional/build.gradle.kts | 13 +- .../org/apache/sis/gui/map/ValuesFormatter.java| 2 +- 24 files changed, 302 insertions(+), 41 deletions(-)
[sis] branch geoapi-3.1 updated (fba1ecf3f7 -> 2730c89d63)
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 fba1ecf3f7 Merge branch 'geoapi-4.0' into geoapi-3.1 add c847947bde Fix some Javadoc warnings. add 17c3f73eca Generate sources JAR and Javadoc JAR together with the Maven artifacts. add 24b12731b9 Add GPG signing for endorsed and optional modules. Incubator modules are not signed because not intended to be released. new 2730c89d63 Merge branch 'geoapi-4.0' into geoapi-3.1 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: .../apache/sis/buildtools/gradle/BuildHelper.java | 1 + .../apache/sis/buildtools/gradle/Dependency.java | 2 +- .../apache/sis/buildtools/gradle/ModularJAR.java | 9 +- .../sis/buildtools/gradle/ModularSources.java | 147 + .../apache/sis/buildtools/gradle/ZipWriter.java| 2 +- endorsed/build.gradle.kts | 109 --- .../org/apache/sis/filter/sqlmm/OneGeometry.java | 2 + .../org/apache/sis/filter/sqlmm/ST_Transform.java | 2 + .../org/apache/sis/filter/sqlmm/TwoGeometries.java | 2 + .../main/org/apache/sis/util/iso/Types.java| 5 +- .../bind/metadata/replace/QualityParameter.java| 6 +- .../sis/referencing/AbstractIdentifiedObject.java | 4 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +- .../org/apache/sis/storage/gpx/WritableStore.java | 1 - .../org/apache/sis/storage/StorageConnector.java | 2 + .../org/apache/sis/storage/WritableFeatureSet.java | 1 - .../org/apache/sis/converter/NumberConverter.java | 2 + .../org/apache/sis/converter/ObjectToString.java | 4 + .../org/apache/sis/converter/StringConverter.java | 4 + .../sis/util/collection/WeakValueHashMap.java | 2 +- .../apache/sis/util/internal/MetadataServices.java | 2 - incubator/build.gradle.kts | 15 ++- optional/build.gradle.kts | 13 +- .../org/apache/sis/gui/map/ValuesFormatter.java| 2 +- 24 files changed, 302 insertions(+), 41 deletions(-) create mode 100644 buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java
[sis] branch geoapi-4.0 updated: Add GPG signing for endorsed and optional modules. Incubator modules are not signed because not intended to be released.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new 24b12731b9 Add GPG signing for endorsed and optional modules. Incubator modules are not signed because not intended to be released. 24b12731b9 is described below commit 24b12731b9b7b84d0dd5ee78931049b2ae33c9f5 Author: Martin Desruisseaux AuthorDate: Thu Oct 5 15:32:24 2023 +0200 Add GPG signing for endorsed and optional modules. Incubator modules are not signed because not intended to be released. --- .../sis/buildtools/gradle/ModularSources.java | 11 +- endorsed/build.gradle.kts | 24 ++ optional/build.gradle.kts | 8 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java index b07e0cc9ca..9525b4f796 100644 --- a/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java +++ b/buildSrc/src/org.apache.sis.buildtools/main/org/apache/sis/buildtools/gradle/ModularSources.java @@ -39,7 +39,7 @@ final class ModularSources extends ZipWriter.JDK { /** * The Java system property to set to {@code true} for enabling Javadoc generation. */ -private static final String CREATE_JAVADOC_PROPERTY = "org.apache.sis.create-javadoc"; +private static final String RELEASE_VERSION_PROPERTY = "org.apache.sis.releaseVersion"; /** * Creates a helper instance. @@ -101,13 +101,14 @@ final class ModularSources extends ZipWriter.JDK { } /* * For performance reason, we actually generate the Javadoc only of the - * "org.apache.sis.create-javadoc" system property is set to `true`. + * "org.apache.sis.releaseVersion" system property is set to a non-null value. * Otherwise the Javadoc files will be empty. */ -if (Boolean.getBoolean(CREATE_JAVADOC_PROPERTY)) { +final String version = System.getProperty(RELEASE_VERSION_PROPERTY); +if (version != null) { final var pb = new ProcessBuilder("javadoc", "-locale", "en", -"-doctitle","Apache SIS API", +"-doctitle","Apache SIS " + version + " API", "-tag", "category:X:Category:", "-tag", "todo:a:TODO:", "-nonavbar", "-noindex", "-nodeprecatedlist", "-notree", "-nohelp", @@ -129,7 +130,7 @@ final class ModularSources extends ZipWriter.JDK { "For performance reason, Javadoc generation is disabled by default.\n" + "For generating Javadoc, set the following system property:\n" + "\n" + -"" + CREATE_JAVADOC_PROPERTY + "=true\n" + +"" + RELEASE_VERSION_PROPERTY + "=\n" + "\n"); } } else { diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts index b8671e60c3..c4806ce7ed 100644 --- a/endorsed/build.gradle.kts +++ b/endorsed/build.gradle.kts @@ -42,6 +42,7 @@ version = "2.0-SNAPSHOT" plugins { `java-library` `maven-publish` +signing id("org.apache.sis.buildtools") } @@ -444,3 +445,26 @@ publishing { } } } + +signing { +useGpgCmd() +if (System.getProperty("org.apache.sis.releaseVersion") != null) { +sign(publishing.publications["util"]) +sign(publishing.publications["metadata"]) +sign(publishing.publications["referencing"]) +sign(publishing.publications["referencing.gazetteer"]) +sign(publishing.publications["feature"]) +sign(publishing.publications["portrayal"]) +sign(publishing.publications["storage"]) +sign(publishing.publications["storage.sql"]) +sign(publishing.publications["storage.xml"]) +sign(publishing.publications["storage.netcdf"]) +sign(publishing.publications["storage.geotiff"]) +sign(publishing.publications["storage.earthobservation"]) +sign(publishing.publications["cloud.aws"]) +sign(publishing.publications["profile.france"]) +sign(publishing.publications["profile.japan"]) +sign(publishing.publications["console"]) +sign(publishing.publications["openoffice"]) +} +} diff --git a/optional/build.gradle.kts b/optional/build.gradle.kts index 0bfacae2f5..a96990dfa5 100644 --- a/optional/build.gradle.kts +++