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 670856df6a0e762788d97f21c2ef034d74dbef6f
Merge: a95eaf7f5a adb5e5fd85
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu May 9 15:43:36 2024 +0200
Merge branch 'geoapi-3.1'.
.../sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java | 2 +-
.../main/org/apache/sis/metadata/iso/maintenance/package-info.java | 2 ++
.../main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java | 4 +++-
.../main/org/apache/sis/storage/base/MetadataBuilder.java | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
index b788537646,422e4ad8e0..2cec5bf660
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
@@@ -42,12 -41,10 +41,13 @@@ import static org.apache.sis.metadata.p
// Specific to the main and geoapi-3.1 branches:
import org.opengis.metadata.citation.ResponsibleParty;
+ import org.opengis.temporal.PeriodDuration;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.maintenance.Scope;
+// Specific to the main branch:
+import org.opengis.metadata.quality.Scope;
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.OPTIONAL;
+import static org.opengis.annotation.Specification.ISO_19115;
/**
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java
index 6959334a2d,f384436080..fb98bc56fe
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java
@@@ -16,6 -16,6 +16,7 @@@
*/
package org.apache.sis.pending.temporal;
++import java.io.Serializable;
import java.time.temporal.TemporalAmount;
import org.opengis.temporal.PeriodDuration;
