From eb02779c29c6a7590ada7ee8d28505e4efe1d8ce Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 10 Sep 2016 16:22:24 +1200
Subject: Update Java libraries

---
 pom.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 22000da3d..902a0642e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>9.2.17.v20160517</jetty.version> <!-- Jetty 9.3+ requires Java 8 -->
-        <jersey.version>2.23.1</jersey.version>
+        <jetty.version>9.2.19.v20160908</jetty.version> <!-- Jetty 9.3+ requires Java 8 -->
+        <jersey.version>2.23.2</jersey.version>
     </properties>
 
     <dependencies>
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>9.4.1208.jre7</version>
+            <version>9.4.1210.jre7</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>2.4.7</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.ning</groupId> <!-- org.asynchttpclient starting from version 2.0 -->
             <artifactId>async-http-client</artifactId>
-            <version>1.9.38</version>
+            <version>1.9.39</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -136,7 +136,6 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>2.17</version>
                 <configuration>
-- 
cgit v1.2.3


From 7ddfed27e9135a074b292289bc7ed414485ddf8a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 10 Sep 2016 16:51:09 +1200
Subject: Update version to 3.7 release

---
 pom.xml                   | 2 +-
 setup/windows/traccar.iss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 902a0642e..397c9446b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.traccar</groupId>
     <artifactId>traccar</artifactId>
-    <version>3.6-SNAPSHOT</version>
+    <version>3.7-SNAPSHOT</version>
 
     <name>traccar</name>
     <url>https://www.traccar.org</url>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index f5d41c6b0..d4af5a808 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=3.6
+AppVersion=3.7
 DefaultDirName={pf}\Traccar
 AlwaysRestart=yes
 OutputBaseFilename=traccar-setup
-- 
cgit v1.2.3


From ec31c9b6cb385c0dc67c31b2358fa9dc9242f8a1 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 10 Sep 2016 18:49:37 +1200
Subject: Downgrade Hikari CP version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 397c9446b..d1c63a59a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>2.5.0</version>
+            <artifactId>HikariCP-java7</artifactId>
+            <version>2.4.8</version> <!-- Newer versions require Java 8 -->
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
-- 
cgit v1.2.3