aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pom.xml20
-rw-r--r--src/org/traccar/Context.java5
-rw-r--r--src/org/traccar/geocoder/JsonGeocoder.java4
-rw-r--r--src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java4
-rw-r--r--src/org/traccar/geolocation/UniversalGeolocationProvider.java4
-rw-r--r--src/org/traccar/geolocation/UnwiredGeolocationProvider.java4
-rw-r--r--src/org/traccar/notification/EventForwarder.java2
7 files changed, 22 insertions, 21 deletions
diff --git a/pom.xml b/pom.xml
index 8700c6ff1..fab4a20a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,22 +30,22 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.9.7</version>
+ <version>2.9.9</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.193</version>
+ <version>1.4.194</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.40</version> <!-- Version 6 required Java 8 -->
+ <version>5.1.41</version> <!-- Version 6 required Java 8 -->
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.4.1212.jre7</version>
+ <version>42.0.0.jre7</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java7</artifactId>
- <version>2.4.11</version>
+ <version>2.4.11</version> <!-- Version 2.6 requires Java 8 -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -69,14 +69,14 @@
<version>3.10.6.Final</version>
</dependency>
<dependency>
- <groupId>com.ning</groupId> <!-- org.asynchttpclient starting from version 2.0 -->
+ <groupId>org.asynchttpclient</groupId>
<artifactId>async-http-client</artifactId>
- <version>1.9.40</version>
+ <version>2.0.31</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.22</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -131,12 +131,12 @@
<dependency>
<groupId>org.jxls</groupId>
<artifactId>jxls</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.jxls</groupId>
<artifactId>jxls-poi</artifactId>
- <version>1.0.11</version>
+ <version>1.0.12</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 1a35a2cb4..e84e14b4c 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -17,13 +17,14 @@ package org.traccar;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import com.ning.http.client.AsyncHttpClient;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
import org.apache.velocity.app.VelocityEngine;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
import org.eclipse.jetty.util.URIUtil;
import org.traccar.database.AliasesManager;
import org.traccar.database.CalendarManager;
@@ -155,7 +156,7 @@ public final class Context {
return velocityEngine;
}
- private static final AsyncHttpClient ASYNC_HTTP_CLIENT = new AsyncHttpClient();
+ private static final AsyncHttpClient ASYNC_HTTP_CLIENT = new DefaultAsyncHttpClient();
public static AsyncHttpClient getAsyncHttpClient() {
return ASYNC_HTTP_CLIENT;
diff --git a/src/org/traccar/geocoder/JsonGeocoder.java b/src/org/traccar/geocoder/JsonGeocoder.java
index 6d1380729..a914f26d8 100644
--- a/src/org/traccar/geocoder/JsonGeocoder.java
+++ b/src/org/traccar/geocoder/JsonGeocoder.java
@@ -15,8 +15,8 @@
*/
package org.traccar.geocoder;
-import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.Response;
+import org.asynchttpclient.AsyncCompletionHandler;
+import org.asynchttpclient.Response;
import org.traccar.Context;
import javax.json.Json;
diff --git a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
index d6e45b550..690a050e1 100644
--- a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
+++ b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
@@ -15,8 +15,8 @@
*/
package org.traccar.geolocation;
-import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.Response;
+import org.asynchttpclient.AsyncCompletionHandler;
+import org.asynchttpclient.Response;
import org.traccar.Context;
import org.traccar.model.CellTower;
import org.traccar.model.Network;
diff --git a/src/org/traccar/geolocation/UniversalGeolocationProvider.java b/src/org/traccar/geolocation/UniversalGeolocationProvider.java
index 6416b2633..ee8ed78f2 100644
--- a/src/org/traccar/geolocation/UniversalGeolocationProvider.java
+++ b/src/org/traccar/geolocation/UniversalGeolocationProvider.java
@@ -16,8 +16,8 @@
package org.traccar.geolocation;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.Response;
+import org.asynchttpclient.AsyncCompletionHandler;
+import org.asynchttpclient.Response;
import org.traccar.Context;
import org.traccar.model.Network;
diff --git a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java b/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
index dcc5a4e7a..f9cef3de6 100644
--- a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
+++ b/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
@@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.Response;
+import org.asynchttpclient.AsyncCompletionHandler;
+import org.asynchttpclient.Response;
import org.traccar.Context;
import org.traccar.model.CellTower;
import org.traccar.model.Network;
diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java
index bd7cfc0c5..32556808c 100644
--- a/src/org/traccar/notification/EventForwarder.java
+++ b/src/org/traccar/notification/EventForwarder.java
@@ -16,7 +16,7 @@
package org.traccar.notification;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
+import org.asynchttpclient.BoundRequestBuilder;
import org.traccar.Context;
import org.traccar.helper.Log;
import org.traccar.model.Device;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 07:38:49 +0000