Version 2.7 release

7 files changed, 55 insertions, 7 deletions

diff --git a/opengts.cfg b/opengts.cfg
index 520a7b3b8..ac4743b2d 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -268,4 +268,16 @@
     <entry key='easytrack.enable'>true</entry>
     <entry key='easytrack.port'>5056</entry>
 
+    <!-- TAIP server configuration -->
+    <entry key='taip.enable'>true</entry>
+    <entry key='taip.port'>5057</entry>
+
+    <!-- KHD server configuration -->
+    <entry key='khd.enable'>true</entry>
+    <entry key='khd.port'>5058</entry>
+
+    <!-- Piligrim server configuration -->
+    <entry key='piligrim.enable'>true</entry>
+    <entry key='piligrim.port'>5059</entry>
+
 </properties>
diff --git a/pom.xml b/pom.xml
index cc63ab0e6..c0b6df657 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.6-SNAPSHOT</version>
+    <version>2.7-SNAPSHOT</version>
 
     <name>traccar</name>
     <url>http://www.traccar.org</url>
@@ -22,17 +22,17 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.174</version>
+            <version>1.3.175</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.26</version>
+            <version>5.1.28</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
-            <version>3.7.0.Final</version>
+            <version>3.9.0.Final</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.eclipse.jetty.aggregate</groupId>
             <artifactId>jetty-all-server</artifactId>
-            <version>8.1.13.v20130916</version>
+            <version>8.1.14.v20131031</version>
         </dependency>
     </dependencies>
 
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index ced94805d..608e3688a 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -285,4 +285,16 @@
     <entry key='easytrack.enable'>true</entry>
     <entry key='easytrack.port'>5056</entry>
 
+    <!-- TAIP server configuration -->
+    <entry key='taip.enable'>true</entry>
+    <entry key='taip.port'>5057</entry>
+
+    <!-- KHD server configuration -->
+    <entry key='khd.enable'>true</entry>
+    <entry key='khd.port'>5058</entry>
+
+    <!-- Piligrim server configuration -->
+    <entry key='piligrim.enable'>true</entry>
+    <entry key='piligrim.port'>5059</entry>
+
 </properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index ced94805d..608e3688a 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -285,4 +285,16 @@
     <entry key='easytrack.enable'>true</entry>
     <entry key='easytrack.port'>5056</entry>
 
+    <!-- TAIP server configuration -->
+    <entry key='taip.enable'>true</entry>
+    <entry key='taip.port'>5057</entry>
+
+    <!-- KHD server configuration -->
+    <entry key='khd.enable'>true</entry>
+    <entry key='khd.port'>5058</entry>
+
+    <!-- Piligrim server configuration -->
+    <entry key='piligrim.enable'>true</entry>
+    <entry key='piligrim.port'>5059</entry>
+
 </properties>
diff --git a/setup/package.sh b/setup/package.sh
index faf835c6f..c80a3d038 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -66,7 +66,7 @@ zip -j tracker-server.zip ../target/tracker-server.jar universal/README.txt
 # WINDOWS PACKAGE
 
 innoextract isetup-*.exe
-echo "NOTE: if you got any errors here try isetup version 5.4.3 (or check what versions are supported by 'innoextract -v')"
+echo "NOTE: if you got any errors here try isetup version 5.5.0 (or check what versions are supported by 'innoextract -v')"
 
 wine app/ISCC.exe windows/traccar.iss
 
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 7e96d9955..8d5a00c93 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -285,4 +285,16 @@
     <entry key='easytrack.enable'>true</entry>

     <entry key='easytrack.port'>5056</entry>

 

+    <!-- TAIP server configuration -->

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

+    <entry key='taip.port'>5057</entry>

+

+    <!-- KHD server configuration -->

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

+    <entry key='khd.port'>5058</entry>

+

+    <!-- Piligrim server configuration -->

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

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

+

 </properties>

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

 AppName=Traccar

-AppVersion=2.6

+AppVersion=2.7

 DefaultDirName={pf}\Traccar

 AlwaysRestart=yes