dependency upgrade

noi-techpark · Oct 20, 2023 · 7200f70 · 7200f70
1 parent cae2bc5
commit 7200f70
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/dc-interface/pom.xml b/dc-interface/pom.xml
@@ -81,15 +81,19 @@ SPDX-License-Identifier: CC0-1.0
 
 		<!-- To handle spatial objects and transformations -->
 		<dependency>
-		    <groupId>com.vividsolutions</groupId>
-		    <artifactId>jts-core</artifactId>
-		    <version>1.14.0</version>
+			<groupId>org.locationtech.jts</groupId>
+			<artifactId>jts-core</artifactId>
+			<version>1.18.2</version>
 		</dependency>
-		<!-- deprecated API removed with java 11, included for compatibility reasons -->
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.3.2</version>
+			<groupId>org.locationtech.spatial4j</groupId>
+			<artifactId>spatial4j</artifactId>
+			<version>0.8</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.1.1</version>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>

diff --git a/dc-interface/src/main/java/it/bz/idm/bdp/DataPusher.java b/dc-interface/src/main/java/it/bz/idm/bdp/DataPusher.java
@@ -5,11 +5,9 @@
 
 package it.bz.idm.bdp;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

diff --git a/dc-interface/src/main/java/it/bz/idm/bdp/json/NonBlockingJSONPusher.java b/dc-interface/src/main/java/it/bz/idm/bdp/json/NonBlockingJSONPusher.java
@@ -10,9 +10,6 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -29,6 +26,8 @@
 import it.bz.idm.bdp.dto.StationDto;
 import it.bz.idm.bdp.dto.StationList;
 import it.bz.idm.bdp.util.Utils;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import reactor.core.publisher.Mono;
 
 import static net.logstash.logback.argument.StructuredArguments.v;