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 333a915b334450cfb6da4048afe2c5070dee9634 Merge: 451609a3ee d262762271 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Sep 23 13:15:28 2025 +0200 Merge branch 'geoapi-3.1': renaming of the "privy" internal package. .../main/org/apache/sis/feature/EnvelopeOperation.java | 2 +- .../main/org/apache/sis/feature/GroupAsPolylineOperation.java | 2 +- .../main/org/apache/sis/feature/StringJoinOperation.java | 2 +- .../main/org/apache/sis/feature/builder/AttributeTypeBuilder.java | 2 +- .../main/org/apache/sis/feature/builder/FeatureTypeBuilder.java | 2 +- .../main/org/apache/sis/metadata/iso/DefaultMetadata.java | 2 +- .../main/org/apache/sis/metadata/iso/citation/Citations.java | 2 +- .../iso/identification/DefaultRepresentativeFraction.java | 2 +- .../test/org/apache/sis/openoffice/ReferencingFunctionsTest.java | 2 +- .../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 4 ++-- .../main/org/apache/sis/io/wkt/Element.java | 2 +- .../main/org/apache/sis/io/wkt/Formatter.java | 4 ++-- .../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 8 ++++---- .../main/org/apache/sis/io/wkt/WKTDictionary.java | 2 +- .../main/org/apache/sis/referencing/AbstractIdentifiedObject.java | 2 +- .../main/org/apache/sis/referencing/AuthorityFactories.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 6 +++--- .../main/org/apache/sis/referencing/CommonCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +- .../main/org/apache/sis/referencing/cs/AbstractCS.java | 2 +- .../main/org/apache/sis/referencing/cs/CoordinateSystems.java | 2 +- .../main/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +- .../main/org/apache/sis/referencing/cs/Normalizer.java | 2 +- .../main/org/apache/sis/referencing/datum/AbstractDatum.java | 6 +++--- .../org/apache/sis/referencing/datum/BursaWolfParameters.java | 2 +- .../org/apache/sis/referencing/datum/DefaultGeodeticDatum.java | 2 +- .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 2 +- .../apache/sis/referencing/factory/CommonAuthorityFactory.java | 2 +- .../org/apache/sis/referencing/factory/GeodeticObjectFactory.java | 2 +- .../apache/sis/referencing/factory/MultiAuthoritiesFactory.java | 2 +- .../org/apache/sis/referencing/factory/sql/EPSGDataAccess.java | 6 +++--- .../sis/referencing/operation/AbstractCoordinateOperation.java | 4 ++-- .../apache/sis/referencing/operation/AbstractSingleOperation.java | 2 +- .../sis/referencing/operation/CoordinateOperationFinder.java | 6 +++--- .../sis/referencing/operation/CoordinateOperationRegistry.java | 6 +++--- .../sis/referencing/operation/DefaultConcatenatedOperation.java | 4 ++-- .../apache/sis/referencing/operation/InverseOperationMethod.java | 2 +- .../apache/sis/referencing/operation/MathTransformContext.java | 2 +- .../sis/referencing/operation/builder/LinearTransformBuilder.java | 2 +- .../org/apache/sis/referencing/operation/gridded/GridGroup.java | 2 +- .../sis/referencing/operation/matrix/AffineTransforms2D.java | 2 +- .../org/apache/sis/referencing/operation/matrix/Matrices.java | 4 ++-- .../org/apache/sis/referencing/operation/matrix/MatrixSIS.java | 2 +- .../main/org/apache/sis/referencing/operation/matrix/Solver.java | 2 +- .../sis/referencing/operation/projection/AlbersEqualArea.java | 2 +- .../sis/referencing/operation/projection/AuthalicConversion.java | 2 +- .../sis/referencing/operation/projection/ConformalProjection.java | 2 +- .../referencing/operation/projection/LambertConicConformal.java | 2 +- .../referencing/operation/projection/ObliqueStereographic.java | 2 +- .../sis/referencing/operation/projection/PolarStereographic.java | 2 +- .../sis/referencing/operation/projection/SatelliteTracking.java | 2 +- .../operation/provider/FranceGeocentricInterpolation.java | 2 +- .../main/org/apache/sis/referencing/operation/provider/NTv2.java | 2 +- .../sis/referencing/operation/provider/PolarStereographicA.java | 2 +- .../referencing/operation/transform/ConcatenatedTransform.java | 2 +- .../sis/referencing/operation/transform/ContextualParameters.java | 2 +- .../operation/transform/DefaultMathTransformFactory.java | 2 +- .../operation/transform/EllipsoidToCentricTransform.java | 2 +- .../sis/referencing/operation/transform/LinearTransform1D.java | 2 +- .../sis/referencing/operation/transform/ProjectiveTransform.java | 2 +- .../sis/referencing/operation/transform/ScaleTransform.java | 2 +- .../referencing/operation/transform/SpecializableTransform.java | 2 +- .../sis/referencing/operation/transform/TransformSeparator.java | 2 +- .../sis/referencing/operation/transform/TranslationTransform.java | 2 +- .../operation/DefaultCoordinateOperationFactoryTest.java | 2 +- .../main/org/apache/sis/util/collection/DefaultTreeTable.java | 2 +- .../main/org/apache/sis/util/logging/MonolineFormatter.java | 2 +- .../main/org/apache/sis/gui/coverage/GridViewSkin.java | 2 +- 68 files changed, 86 insertions(+), 86 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java index adb0f99bda,5729aefcaf..2a3ba0ad2c --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java @@@ -35,10 -35,22 +35,10 @@@ import org.apache.sis.util.Classes import org.apache.sis.util.internal.shared.CollectionsExt; import org.apache.sis.util.internal.shared.UnmodifiableArrayList; import org.apache.sis.converter.SurjectiveConverter; - import org.apache.sis.feature.internal.shared.AttributeConvention; import org.apache.sis.feature.internal.Resources; + import org.apache.sis.feature.internal.shared.AttributeConvention; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.AttributeType; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.feature.FeatureAssociationRole; -import org.opengis.feature.IdentifiedType; -import org.opengis.feature.InvalidPropertyValueException; -import org.opengis.feature.Operation; -import org.opengis.feature.Property; -import org.opengis.feature.PropertyType; -import org.opengis.feature.PropertyNotFoundException; - /** * An operation concatenating the string representations of the values of multiple properties. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java index 3bda39af60,0a2a07b161..5cdff6f346 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java @@@ -81,12 -81,12 +81,12 @@@ import org.apache.sis.metadata.simple.S import org.apache.sis.metadata.iso.extent.Extents; import org.apache.sis.metadata.iso.citation.Citations; import org.apache.sis.referencing.AbstractIdentifiedObject; -import org.apache.sis.referencing.DefaultObjectDomain; import org.apache.sis.referencing.ImmutableIdentifier; +import org.apache.sis.referencing.DefaultObjectDomain; - import org.apache.sis.referencing.internal.shared.WKTKeywords; - import org.apache.sis.referencing.internal.shared.WKTUtilities; import org.apache.sis.referencing.internal.Epoch; import org.apache.sis.referencing.internal.Resources; + import org.apache.sis.referencing.internal.shared.WKTKeywords; + import org.apache.sis.referencing.internal.shared.WKTUtilities; import org.apache.sis.geometry.AbstractDirectPosition; import org.apache.sis.geometry.AbstractEnvelope; import org.apache.sis.xml.NilObject; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java index 6b5be7f42e,5f4572a82e..f870163e27 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java @@@ -79,10 -79,8 +79,10 @@@ import org.opengis.referencing.Referenc import org.opengis.referencing.operation.Conversion; import org.opengis.referencing.operation.Projection; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.referencing.ObjectDomain; +// Specific to the main branch: +import org.opengis.referencing.ReferenceSystem; - import org.apache.sis.metadata.iso.DefaultIdentifier; +import org.apache.sis.referencing.internal.Legacy; ++import org.apache.sis.metadata.iso.DefaultIdentifier; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java index 91bd4f4a0d,9cda8728df..297dd2428b --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java @@@ -53,14 -53,14 +53,14 @@@ import org.apache.sis.io.wkt.ElementKin import org.apache.sis.io.wkt.Formatter; import static org.apache.sis.util.Utilities.deepEquals; + // Specific to the main and geoapi-3.1 branches: + import org.opengis.referencing.datum.ImageDatum; + -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.Identifier; -import org.opengis.referencing.datum.DatumEnsemble; -import org.opengis.referencing.datum.DynamicReferenceFrame; +// Specific to the main branch: +import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.extent.Extent; +import org.apache.sis.referencing.internal.Legacy; - // Specific to the geoapi-3.1 and geoapi-4.0 branches: - import org.opengis.referencing.datum.ImageDatum; - /** * Specifies the relationship of a Coordinate System to the earth. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java index 01e2bcd6e8,e78488d300..315092643e --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java @@@ -34,14 -34,14 +34,14 @@@ import org.apache.sis.util.internal.sha import org.apache.sis.math.DecimalFunctions; import org.apache.sis.math.MathFunctions; import org.apache.sis.pending.jdk.JDK21; - import org.apache.sis.referencing.internal.shared.AxisDirections; - import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix; import org.apache.sis.referencing.internal.Resources; import org.apache.sis.referencing.internal.Arithmetic; + import org.apache.sis.referencing.internal.shared.AxisDirections; + import org.apache.sis.referencing.internal.shared.ExtendedPrecisionMatrix; import org.apache.sis.referencing.operation.transform.MathTransforms; // For javadoc -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; +// Specific to the main branch: +import org.opengis.geometry.MismatchedDimensionException; /**
