(sis) 04/04: Merge branch 'geoapi-3.1': skip the replacement of SIS assertion methods by GeoAPI ones since the latter do not exist on GeoAPI 3.0.

[desruisseaux]

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 131b4ae055b0595daa4d38b5aac4d8bb3e24bb7b
Merge: 9ccb657bbb 6cd28b5cd2
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Feb 17 23:11:29 2024 +0100

    Merge branch 'geoapi-3.1':
    skip the replacement of SIS assertion methods by GeoAPI ones since the 
latter do not exist on GeoAPI 3.0.

 .../test/org/apache/sis/image/MaskedImageTest.java                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc 
endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
index 81c8e5c26e,e09fc2028a..2bfaa9a38e
--- 
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
+++ 
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
@@@ -36,8 -36,9 +36,8 @@@ import org.apache.sis.util.Debug
  // Test dependencies
  import org.junit.jupiter.api.Test;
  import static org.junit.jupiter.api.Assertions.*;
- import org.apache.sis.test.TestCase;
 -import static org.opengis.test.Assertions.assertSampleValuesEqual;
  import static org.apache.sis.feature.Assertions.assertPixelsEqual;
+ import org.apache.sis.test.TestCase;
  
  
  /**