[sis] 02/02: Merge branch 'geoapi-3.1'. The commits in this merge were already present on `master` branch. This merge is for making sure that `master` and `geoapi-4.0` are synchronized.

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 884973020bc349ed7aa62e581cd6eb2287dcf501
Merge: a07b4869f9 2afe9dfcf6
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Nov 19 17:35:03 2022 +0100

    Merge branch 'geoapi-3.1'.
    The commits in this merge were already present on `master` branch.
    This merge is for making sure that `master` and `geoapi-4.0` are synchronized.

 .../apache/sis/referencing/operation/DefaultPassThroughOperation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
index 60749dbaa6,7499f5c35f..5b358aefee
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
@@@ -23,9 -23,10 +23,10 @@@ import javax.xml.bind.Unmarshaller
  import javax.xml.bind.annotation.XmlType;
  import javax.xml.bind.annotation.XmlElement;
  import javax.xml.bind.annotation.XmlRootElement;
 -import org.opengis.parameter.ParameterValueGroup;
  import org.opengis.util.FactoryException;
 +import org.opengis.parameter.ParameterValueGroup;
  import org.opengis.referencing.operation.MathTransform;
+ import org.opengis.referencing.operation.Conversion;
  import org.opengis.referencing.operation.CoordinateOperation;
  import org.opengis.referencing.operation.PassThroughOperation;
  import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@@ -44,9 -45,7 +45,8 @@@ import org.apache.sis.io.wkt.Formatter
  import org.apache.sis.referencing.CRS;
  
  import static org.apache.sis.util.Utilities.deepEquals;
- import org.opengis.referencing.operation.Conversion;
  
 +// Branch-dependent imports
  import org.opengis.referencing.operation.OperationMethod;
  import org.opengis.referencing.operation.SingleOperation;