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 dd9c40499b05fe87bb00ce6afce1a7af56acce22
Merge: 52303614bb 0d9f40a5a4
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Oct 10 11:16:40 2024 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1

 .../sis/buildtools/coding/ReorganizeImports.java   |  4 +-
 .../sis/referencing/internal/EPSGFactoryProxy.java |  2 +-
 .../apache/sis/geometry/AbstractEnvelopeTest.java  |  4 +-
 .../apache/sis/geometry/CoordinateFormatTest.java  | 52 +++++++++++-----------
 .../org/apache/sis/geometry/EnvelopesTest.java     | 11 +++++
 .../sis/geometry/GeneralDirectPositionTest.java    |  4 +-
 .../apache/sis/geometry/GeneralEnvelopeTest.java   |  4 +-
 .../apache/sis/geometry/ImmutableEnvelopeTest.java |  6 +--
 .../org/apache/sis/geometry/TransformTestCase.java |  4 +-
 .../test/org/apache/sis/io/wkt/CRSParserTest.java  | 11 +++++
 .../org/apache/sis/io/wkt/ComparisonWithEPSG.java  |  4 +-
 .../sis/io/wkt/GeodeticObjectParserTest.java       |  4 +-
 .../org/apache/sis/io/wkt/WKTDictionaryTest.java   |  4 +-
 .../test/org/apache/sis/io/wkt/WKTFormatTest.java  |  4 +-
 .../sis/referencing/AuthorityFactoriesTest.java    | 10 +++++
 .../test/org/apache/sis/referencing/CRSTest.java   | 10 +++++
 .../org/apache/sis/referencing/CommonCRSTest.java  |  3 +-
 .../sis/referencing/EPSGDependentTestCase.java     | 52 ++++++++++++++++++++++
 .../sis/referencing/StandardDefinitionsTest.java   |  3 +-
 19 files changed, 145 insertions(+), 51 deletions(-)

diff --cc 
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
index 84ab46cbfc,84417aee45..46efb509e4
--- 
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
+++ 
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
@@@ -25,7 -25,6 +25,7 @@@ import org.opengis.util.InternationalSt
  
  // Specific to the geoapi-3.1 and geoapi-4.0 branches:
  import java.util.Optional;
++import org.apache.sis.referencing.GeodeticException;
  
  
  /**

Reply via email to