aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-08-24 13:33:39 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2014-08-24 13:33:39 +1200
commitd78b41d36a84f5e0560c3474cdc1912def450971 (patch)
tree1dad234b0850a2ab8be6259d2f9c2a8ea15be25a
parent77b47931a4cc52d69359c8878169f1caa3050b03 (diff)
downloadtraccar-server-d78b41d36a84f5e0560c3474cdc1912def450971.tar.gz
traccar-server-d78b41d36a84f5e0560c3474cdc1912def450971.tar.bz2
traccar-server-d78b41d36a84f5e0560c3474cdc1912def450971.zip
Version 2.9 release
-rw-r--r--opengts.cfg32
-rw-r--r--pom.xml10
-rw-r--r--setup/linux/traccar.cfg32
-rw-r--r--setup/macosx/traccar.cfg32
-rw-r--r--setup/windows/traccar.cfg32
-rw-r--r--setup/windows/traccar.iss2
6 files changed, 134 insertions, 6 deletions
diff --git a/opengts.cfg b/opengts.cfg
index da819e1e9..16deb38ec 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -285,4 +285,36 @@
<entry key='cartrack.enable'>true</entry>
<entry key='cartrack.port'>5061</entry>
+ <!-- MiniFinder server configuration -->
+ <entry key='minifinder.enable'>true</entry>
+ <entry key='minifinder.port'>5062</entry>
+
+ <!-- Haicom server configuration -->
+ <entry key='haicom.enable'>true</entry>
+ <entry key='haicom.port'>5063</entry>
+
+ <!-- eeLink server configuration -->
+ <entry key='eelink.enable'>true</entry>
+ <entry key='eelink.port'>5064</entry>
+
+ <!-- Box server configuration -->
+ <entry key='box.enable'>true</entry>
+ <entry key='box.port'>5065</entry>
+
+ <!-- Freedom server configuration -->
+ <entry key='freedom.enable'>true</entry>
+ <entry key='freedom.port'>5066</entry>
+
+ <!-- Telik Pikotrack server configuration -->
+ <entry key='telik.enable'>true</entry>
+ <entry key='telik.port'>5067</entry>
+
+ <!-- Trackbox server configuration -->
+ <entry key='trackbox.enable'>true</entry>
+ <entry key='trackbox.port'>5068</entry>
+
+ <!-- Visiontek server configuration -->
+ <entry key='visiontek.enable'>true</entry>
+ <entry key='visiontek.port'>5069</entry>
+
</properties>
diff --git a/pom.xml b/pom.xml
index bbf957193..47b7be113 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.8-SNAPSHOT</version>
+ <version>2.9-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.176</version>
+ <version>1.4.180</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.30</version>
+ <version>5.1.31</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.9.0.Final</version>
+ <version>3.9.2.Final</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -82,7 +82,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<archive>
<manifest>
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 1cf16119b..99f59914a 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -302,4 +302,36 @@
<entry key='cartrack.enable'>true</entry>
<entry key='cartrack.port'>5061</entry>
+ <!-- MiniFinder server configuration -->
+ <entry key='minifinder.enable'>true</entry>
+ <entry key='minifinder.port'>5062</entry>
+
+ <!-- Haicom server configuration -->
+ <entry key='haicom.enable'>true</entry>
+ <entry key='haicom.port'>5063</entry>
+
+ <!-- eeLink server configuration -->
+ <entry key='eelink.enable'>true</entry>
+ <entry key='eelink.port'>5064</entry>
+
+ <!-- Box server configuration -->
+ <entry key='box.enable'>true</entry>
+ <entry key='box.port'>5065</entry>
+
+ <!-- Freedom server configuration -->
+ <entry key='freedom.enable'>true</entry>
+ <entry key='freedom.port'>5066</entry>
+
+ <!-- Telik Pikotrack server configuration -->
+ <entry key='telik.enable'>true</entry>
+ <entry key='telik.port'>5067</entry>
+
+ <!-- Trackbox server configuration -->
+ <entry key='trackbox.enable'>true</entry>
+ <entry key='trackbox.port'>5068</entry>
+
+ <!-- Visiontek server configuration -->
+ <entry key='visiontek.enable'>true</entry>
+ <entry key='visiontek.port'>5069</entry>
+
</properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 1cf16119b..99f59914a 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -302,4 +302,36 @@
<entry key='cartrack.enable'>true</entry>
<entry key='cartrack.port'>5061</entry>
+ <!-- MiniFinder server configuration -->
+ <entry key='minifinder.enable'>true</entry>
+ <entry key='minifinder.port'>5062</entry>
+
+ <!-- Haicom server configuration -->
+ <entry key='haicom.enable'>true</entry>
+ <entry key='haicom.port'>5063</entry>
+
+ <!-- eeLink server configuration -->
+ <entry key='eelink.enable'>true</entry>
+ <entry key='eelink.port'>5064</entry>
+
+ <!-- Box server configuration -->
+ <entry key='box.enable'>true</entry>
+ <entry key='box.port'>5065</entry>
+
+ <!-- Freedom server configuration -->
+ <entry key='freedom.enable'>true</entry>
+ <entry key='freedom.port'>5066</entry>
+
+ <!-- Telik Pikotrack server configuration -->
+ <entry key='telik.enable'>true</entry>
+ <entry key='telik.port'>5067</entry>
+
+ <!-- Trackbox server configuration -->
+ <entry key='trackbox.enable'>true</entry>
+ <entry key='trackbox.port'>5068</entry>
+
+ <!-- Visiontek server configuration -->
+ <entry key='visiontek.enable'>true</entry>
+ <entry key='visiontek.port'>5069</entry>
+
</properties>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 64c6fff1f..a58f6e7d4 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -302,4 +302,36 @@
<entry key='cartrack.enable'>true</entry>
<entry key='cartrack.port'>5061</entry>
+ <!-- MiniFinder server configuration -->
+ <entry key='minifinder.enable'>true</entry>
+ <entry key='minifinder.port'>5062</entry>
+
+ <!-- Haicom server configuration -->
+ <entry key='haicom.enable'>true</entry>
+ <entry key='haicom.port'>5063</entry>
+
+ <!-- eeLink server configuration -->
+ <entry key='eelink.enable'>true</entry>
+ <entry key='eelink.port'>5064</entry>
+
+ <!-- Box server configuration -->
+ <entry key='box.enable'>true</entry>
+ <entry key='box.port'>5065</entry>
+
+ <!-- Freedom server configuration -->
+ <entry key='freedom.enable'>true</entry>
+ <entry key='freedom.port'>5066</entry>
+
+ <!-- Telik Pikotrack server configuration -->
+ <entry key='telik.enable'>true</entry>
+ <entry key='telik.port'>5067</entry>
+
+ <!-- Trackbox server configuration -->
+ <entry key='trackbox.enable'>true</entry>
+ <entry key='trackbox.port'>5068</entry>
+
+ <!-- Visiontek server configuration -->
+ <entry key='visiontek.enable'>true</entry>
+ <entry key='visiontek.port'>5069</entry>
+
</properties>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index c334fe742..b827807d7 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=Traccar
-AppVersion=2.8
+AppVersion=2.9
DefaultDirName={pf}\Traccar
AlwaysRestart=yes