Release 2.8 versionv2.8

6 files changed, 37 insertions, 5 deletions

diff --git a/opengts.cfg b/opengts.cfg
index ac4743b2d..c738fcf0e 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -280,4 +280,12 @@
     <entry key='piligrim.enable'>true</entry>
     <entry key='piligrim.port'>5059</entry>
 
+    <!-- STL060 server configuration -->
+    <entry key='stl060.enable'>true</entry>
+    <entry key='stl060.port'>5060</entry>
+
+    <!-- CarTrack server configuration -->
+    <entry key='cartrack.enable'>true</entry>
+    <entry key='cartrack.port'>5061</entry>
+
 </properties>
diff --git a/pom.xml b/pom.xml
index c0b6df657..bbf957193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.traccar</groupId>
     <artifactId>traccar</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.8-SNAPSHOT</version>
 
     <name>traccar</name>
     <url>http://www.traccar.org</url>
@@ -22,12 +22,12 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.175</version>
+            <version>1.3.176</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.28</version>
+            <version>5.1.30</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.eclipse.jetty.aggregate</groupId>
             <artifactId>jetty-all-server</artifactId>
-            <version>8.1.14.v20131031</version>
+            <version>8.1.15.v20140411</version>
         </dependency>
     </dependencies>
 
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 608e3688a..0e0349283 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -297,4 +297,12 @@
     <entry key='piligrim.enable'>true</entry>
     <entry key='piligrim.port'>5059</entry>
 
+    <!-- STL060 server configuration -->
+    <entry key='stl060.enable'>true</entry>
+    <entry key='stl060.port'>5060</entry>
+
+    <!-- CarTrack server configuration -->
+    <entry key='cartrack.enable'>true</entry>
+    <entry key='cartrack.port'>5061</entry>
+
 </properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 608e3688a..0e0349283 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -297,4 +297,12 @@
     <entry key='piligrim.enable'>true</entry>
     <entry key='piligrim.port'>5059</entry>
 
+    <!-- STL060 server configuration -->
+    <entry key='stl060.enable'>true</entry>
+    <entry key='stl060.port'>5060</entry>
+
+    <!-- CarTrack server configuration -->
+    <entry key='cartrack.enable'>true</entry>
+    <entry key='cartrack.port'>5061</entry>
+
 </properties>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 8d5a00c93..412a8d612 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -297,4 +297,12 @@
     <entry key='piligrim.enable'>true</entry>

     <entry key='piligrim.port'>5059</entry>

 

+    <!-- STL060 server configuration -->

+    <entry key='stl060.enable'>true</entry>

+    <entry key='stl060.port'>5060</entry>

+

+    <!-- CarTrack server configuration -->

+    <entry key='cartrack.enable'>true</entry>

+    <entry key='cartrack.port'>5061</entry>

+

 </properties>

diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 93ea24eb6..c334fe742 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]

 AppName=Traccar

-AppVersion=2.7

+AppVersion=2.8

 DefaultDirName={pf}\Traccar

 AlwaysRestart=yes