This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit afb89a72a8499921724d4f00eb41c63e044c02f2 Author: Thomas Thelen <[email protected]> AuthorDate: Tue Jun 23 08:33:32 2026 -0700 GH-3505 Bump sis from 1.4 to 1.5 --- jena-geosparql/pom.xml | 7 +++++++ .../jena/geosparql/implementation/SRSInfoTest.java | 11 ++++++++--- .../implementation/registry/SRSRegistryTest.java | 16 ++-------------- .../jena/geosparql/spatial/SearchEnvelopeTest.java | 11 ++++++++--- pom.xml | 2 +- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/jena-geosparql/pom.xml b/jena-geosparql/pom.xml index 7a95aab430..71568cad41 100644 --- a/jena-geosparql/pom.xml +++ b/jena-geosparql/pom.xml @@ -83,6 +83,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.15.2.0</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> 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 295c14ff95..7c1e37db11 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 @@ -65,10 +65,15 @@ public class SRSInfoTest { //public static final double OS_Y2 = 1256558.4455361878; // SIS 1.4 - public static final double OS_X1 = -104009.35713717458; + //public static final double OS_X1 = -104009.35713717458; + //public static final double OS_X2 = 688806.0073395987; + //public static final double OS_Y1 = -16627.734528042376; + //public static final double OS_Y2 = 1256558.445536187; + // SIS 1.5 + public static final double OS_X1 = -104728.76470298576; public static final double OS_X2 = 688806.0073395987; - public static final double OS_Y1 = -16627.734528042376; - public static final double OS_Y2 = 1256558.445536187; + public static final double OS_Y1 = -16627.734527606517; + public static final double OS_Y2 = 1256616.3207024988; /** * Test of buildDomainEnvelope method, of class SRSInfo. diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java index 66e89516ba..56a2b05bd0 100644 --- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java +++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java @@ -80,20 +80,8 @@ public class SRSRegistryTest { String srsURI = SRS_URI.DEFAULT_WKT_CRS84; - String default_CRS_WKT = "GeodeticCRS[\"WGS 84\",\n" - + " Datum[\"World Geodetic System 1984\",\n" - + " Ellipsoid[\"WGS 84\", 6378137.0, 298.257223563]],\n" - + " CS[ellipsoidal, 2],\n" - + " Axis[\"Geodetic longitude (Lon)\", east],\n" - + " Axis[\"Geodetic latitude (Lat)\", north],\n" - + " Unit[\"degree\", 0.017453292519943295],\n" - + " Scope[\"Horizontal component of 3D system. Used by the GPS satellite navigation system and for NATO military geodetic surveying.\"],\n" - + " Area[\"World.\"],\n" - + " BBox[-90.00, -180.00, 90.00, 180.00],\n" - + " Id[\"CRS\", 84, Citation[\"WMS\"], URI[\"urn:ogc:def:crs:OGC:1.3:CRS84\"]]]"; - - CoordinateReferenceSystem expResult = CRS.fromWKT(default_CRS_WKT); - CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI); + CoordinateReferenceSystem expResult = CRS.forCode("CRS:84"); + CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI); assertEquals(expResult.toWKT(), result.toWKT()); } catch (FactoryException ex) { 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 10a1568021..c098ebaaee 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 @@ -77,10 +77,15 @@ public class SearchEnvelopeTest { //public static final double OS_Y1 = -16627.734528041445; //public static final double OS_Y2 = 1256558.4455361878; // SIS 1.4 - public static final double OS_X1 = -104009.35713717458; + //public static final double OS_X1 = -104009.35713717458; + //public static final double OS_X2 = 688806.0073395987; + //public static final double OS_Y1 = -16627.734528042376; + //public static final double OS_Y2 = 1256558.445536187; + // SIS 1.5 + public static final double OS_X1 = -104728.76470298576; public static final double OS_X2 = 688806.0073395987; - public static final double OS_Y1 = -16627.734528042376; - public static final double OS_Y2 = 1256558.445536187; + public static final double OS_Y1 = -16627.734527606517; + public static final double OS_Y2 = 1256616.3207024988; /** * Test of build method, of class SearchEnvelope. diff --git a/pom.xml b/pom.xml index cf0021eb6b..945de08ea4 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ <ver.kryo>5.6.2</ver.kryo> <!-- Used in jena-fuseki-geosparql --> <ver.jcommander>1.82</ver.jcommander> - <ver.sis>1.4</ver.sis> + <ver.sis>1.5</ver.sis> <ver.jts>1.20.0</ver.jts> <ver.jdom2>2.0.6.1</ver.jdom2> <!-- Used in jena-fuseki-mod-geosparql -->
