[jena] branch main updated: JENA-2213: Update to Apache SIS 1.1; align tests to SIS changes.

[andy]

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

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new e12468a  JENA-2213: Update to Apache SIS 1.1; align tests to SIS 
changes.
     new 5bcb0e1  Merge pull request #1169 from afs/sis-update
e12468a is described below

commit e12468a400dbcab321be424e258219525938bc00
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Wed Jan 19 16:43:38 2022 +0000

    JENA-2213: Update to Apache SIS 1.1; align tests to SIS changes.
---
 .../apache/jena/geosparql/implementation/SRSInfoTest.java  |  6 +++++-
 .../apache/jena/geosparql/spatial/SearchEnvelopeTest.java  | 14 ++++++++++----
 pom.xml                                                    |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git 
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
 
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
index 86e987a..0132b6d 100644
--- 
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
+++ 
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
@@ -99,7 +99,11 @@ public class SRSInfoTest {
         CoordinateReferenceSystem crs = CRS.forCode(srsURI);
         Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
 
-        Envelope expResult = new Envelope(-118397.00138845091, 
751441.7790901454, -16627.734375018626, 1272149.3463499574);
+        // SIS 1.0
+        //Envelope expResult = new Envelope(-118397.00138845091, 
751441.7790901454, -16627.734375018626, 1272149.3463499574);
+        // SIS 1.1
+        Envelope expResult = new Envelope(-104009.35713717458, 
688806.0073395987, -16627.734528041445, 1256558.4455361878);
+
         Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
         assertEquals(expResult, result);
     }
diff --git 
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
 
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index fbeb321..5fa3746 100644
--- 
a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++ 
b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -61,10 +61,16 @@ public class SearchEnvelopeTest {
     public static final double Y1 = -90;
     public static final double Y2 = 90;
 
-    public static final double OS_X1 = -118397.00138845091;
-    public static final double OS_X2 = 751441.7790901454;
-    public static final double OS_Y1 = -16627.734375018626;
-    public static final double OS_Y2 = 1272149.3463499574;
+    // SIS 1.0
+    //public static final double OS_X1 = -118397.00138845091;
+    //public static final double OS_X2 = 751441.7790901454;
+    //public static final double OS_Y1 = -16627.734375018626;
+    //public static final double OS_Y2 = 1272149.3463499574;
+    // SIS 1.1
+    public static final double OS_X1 = -104009.35713717458;
+    public static final double OS_X2 = 688806.0073395987;
+    public static final double OS_Y1 = -16627.734528041445;
+    public static final double OS_Y2 = 1256558.4455361878;
 
     /**
      * Test of build method, of class SearchEnvelope.
diff --git a/pom.xml b/pom.xml
index bb7f84e..fa6cbc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
     <ver.contract.tests>0.2.0</ver.contract.tests>
 
     <!--- GeoSPARQL related -->
-    <ver.sis>1.0</ver.sis>
+    <ver.sis>1.1</ver.sis>
     
     <java.version>11</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>