Merge pull request #113 from nls-jajuko/1.4.2-geotools

geotools to version 31.3
nlsfi · Sep 18, 2024 · 372d80e · 372d80e
2 parents 3e16b95 + 17a2ae1
commit 372d80e
Show file tree

Hide file tree

Showing 34 changed files with 37 additions and 37 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fi.nls.hakunapi</groupId>
 	<artifactId>hakunapi</artifactId>
-	<version>1.4.1</version>
+	<version>1.4.2</version>
 	<packaging>pom</packaging>
 
 	<name>Hakunapi</name>
@@ -49,7 +49,7 @@
 		<slf4j.version>1.7.25</slf4j.version>
 		<log4j.version>2.23.1</log4j.version>
 		<pgjdbc.version>42.7.3</pgjdbc.version>
-		<geotools.version>29.5</geotools.version>
+		<geotools.version>31.3</geotools.version>
 		<junit.version>4.13.2</junit.version>
 		<mockito.version>4.11.0</mockito.version>
 		<cyclonedx.version>2.7.3</cyclonedx.version>

diff --git a/src/hakunapi-config-test/pom.xml b/src/hakunapi-config-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-config-test</artifactId>
 

diff --git a/src/hakunapi-core/pom.xml b/src/hakunapi-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-core</artifactId>
 

diff --git a/src/hakunapi-cql2-functions/pom.xml b/src/hakunapi-cql2-functions/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>src</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>hakunapi-cql2-functions</artifactId>
 

diff --git a/src/hakunapi-cql2/pom.xml b/src/hakunapi-cql2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-cql2</artifactId>
 

diff --git a/src/hakunapi-csv/pom.xml b/src/hakunapi-csv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-csv</artifactId>
 

diff --git a/src/hakunapi-esbulk/pom.xml b/src/hakunapi-esbulk/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-esbulk</artifactId>
 

diff --git a/src/hakunapi-geojson/pom.xml b/src/hakunapi-geojson/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-geojson</artifactId>
 

diff --git a/src/hakunapi-gml/pom.xml b/src/hakunapi-gml/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-gml</artifactId>
 

diff --git a/src/hakunapi-gpkg/pom.xml b/src/hakunapi-gpkg/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-gpkg</artifactId>
 

diff --git a/src/hakunapi-html/pom.xml b/src/hakunapi-html/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-html</artifactId>
 

diff --git a/src/hakunapi-jsonfg/pom.xml b/src/hakunapi-jsonfg/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-jsonfg</artifactId>
 

diff --git a/src/hakunapi-proj-gt/pom.xml b/src/hakunapi-proj-gt/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-proj-gt</artifactId>
 

diff --git a/...hakunapi-proj-gt/src/main/java/fi/nls/hakunapi/proj/gt/GeoToolsProjectionTransformer.java b/...hakunapi-proj-gt/src/main/java/fi/nls/hakunapi/proj/gt/GeoToolsProjectionTransformer.java
@@ -1,7 +1,7 @@
 package fi.nls.hakunapi.proj.gt;
 
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
+import org.geotools.api.referencing.operation.MathTransform;
+import org.geotools.api.referencing.operation.TransformException;
 
 import fi.nls.hakunapi.core.projection.ProjectionTransformer;
 

diff --git a/...i-proj-gt/src/main/java/fi/nls/hakunapi/proj/gt/GeoToolsProjectionTransformerFactory.java b/...i-proj-gt/src/main/java/fi/nls/hakunapi/proj/gt/GeoToolsProjectionTransformerFactory.java
@@ -1,8 +1,8 @@
 package fi.nls.hakunapi.proj.gt;
 
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.operation.MathTransform;
 
 import fi.nls.hakunapi.core.projection.NOPProjectionTransformer;
 import fi.nls.hakunapi.core.projection.ProjectionTransformer;

diff --git a/src/hakunapi-proj-jhe/pom.xml b/src/hakunapi-proj-jhe/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-proj-jhe</artifactId>
 

diff --git a/src/hakunapi-smile/pom.xml b/src/hakunapi-smile/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-smile</artifactId>
 

diff --git a/src/hakunapi-source-oracle/pom.xml b/src/hakunapi-source-oracle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-source-oracle</artifactId>
 

diff --git a/src/hakunapi-source-postgis/pom.xml b/src/hakunapi-source-postgis/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-source-postgis</artifactId>
 

diff --git a/src/hakunapi-telemetry-opentelemetry/pom.xml b/src/hakunapi-telemetry-opentelemetry/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>fi.nls.hakunapi</groupId>
     <artifactId>src</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
   </parent>
   <artifactId>hakunapi-telemetry-opentelemetry</artifactId>
 

diff --git a/src/hakunapi-telemetry/pom.xml b/src/hakunapi-telemetry/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>fi.nls.hakunapi</groupId>
     <artifactId>src</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
   </parent>
   <artifactId>hakunapi-telemetry</artifactId>
     <dependencies>

diff --git a/src/pom.xml b/src/pom.xml
@@ -5,7 +5,7 @@
         <parent>
             <groupId>fi.nls.hakunapi</groupId>
             <artifactId>hakunapi</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.2</version>
         </parent>
 	<artifactId>src</artifactId>
 	<packaging>pom</packaging>

diff --git a/webapp-jakarta/hakunapi-oracle-webapp-jakarta/pom.xml b/webapp-jakarta/hakunapi-oracle-webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-jakarta</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>hakunapi-oracle-webapp-jakarta</artifactId>
 	<packaging>war</packaging>

diff --git a/webapp-jakarta/hakunapi-simple-servlet-jakarta/pom.xml b/webapp-jakarta/hakunapi-simple-servlet-jakarta/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>fi.nls.hakunapi</groupId>
     <artifactId>webapp-jakarta</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
   </parent>
   <artifactId>hakunapi-simple-servlet-jakarta</artifactId>
 

diff --git a/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml b/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-jakarta</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-simple-webapp-jakarta</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-jakarta/hakunapi-simple-webapp-test-jakarta/pom.xml b/webapp-jakarta/hakunapi-simple-webapp-test-jakarta/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-jakarta</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>hakunapi-simple-webapp-test-jakarta</artifactId>
 

diff --git a/webapp-jakarta/hakunapi-telemetry-webapp-jakarta/pom.xml b/webapp-jakarta/hakunapi-telemetry-webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-jakarta</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>hakunapi-telemetry-webapp-jakarta</artifactId>
 	<packaging>war</packaging>

diff --git a/webapp-jakarta/pom.xml b/webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>hakunapi</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>webapp-jakarta</artifactId>
     <packaging>pom</packaging>

diff --git a/webapp-javax/hakunapi-oracle-webapp-javax/pom.xml b/webapp-javax/hakunapi-oracle-webapp-javax/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
   <artifactId>hakunapi-oracle-webapp-javax</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-javax/hakunapi-simple-servlet-javax/pom.xml b/webapp-javax/hakunapi-simple-servlet-javax/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-simple-servlet-javax</artifactId>
     <packaging>jar</packaging>

diff --git a/webapp-javax/hakunapi-simple-webapp-javax/pom.xml b/webapp-javax/hakunapi-simple-webapp-javax/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-simple-webapp-javax</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-javax/hakunapi-simple-webapp-test-javax/pom.xml b/webapp-javax/hakunapi-simple-webapp-test-javax/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-javax</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>hakunapi-simple-webapp-test-javax</artifactId>
 	<packaging>jar</packaging>

diff --git a/webapp-javax/hakunapi-telemetry-webapp-javax/pom.xml b/webapp-javax/hakunapi-telemetry-webapp-javax/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>hakunapi-telemetry-webapp-javax</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-javax/pom.xml b/webapp-javax/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>hakunapi</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>webapp-javax</artifactId>
 	<packaging>pom</packaging>