aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-17 19:04:35 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-17 19:04:35 +1200
commitb068ca92dae416d0300f1092e4c11826596e4e1b (patch)
tree4f19cd763a1606930001a2550a3a37926df3e525
parent04ae68b69bc6d7c5f92f9b3323745300ecb12e2e (diff)
downloadtraccar-server-b068ca92dae416d0300f1092e4c11826596e4e1b.tar.gz
traccar-server-b068ca92dae416d0300f1092e4c11826596e4e1b.tar.bz2
traccar-server-b068ca92dae416d0300f1092e4c11826596e4e1b.zip
Version 2.12 release
-rw-r--r--pom.xml16
-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
5 files changed, 105 insertions, 9 deletions
diff --git a/pom.xml b/pom.xml
index 6fcc8099d..9a8d606f1 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.11-SNAPSHOT</version>
+ <version>2.12-SNAPSHOT</version>
<name>traccar</name>
<url>http://www.traccar.org</url>
@@ -23,17 +23,17 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.184</version>
+ <version>1.4.186</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
+ <version>5.1.35</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.3-1102-jdbc4</version>
+ <version>9.3-1103-jdbc4</version>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.10.0.Final</version>
+ <version>3.10.1.Final</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
@@ -75,7 +75,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
<executions>
<execution>
<phase>package</phase>
@@ -92,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
<archive>
<manifest>
@@ -108,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 32d26ce00..bf1a082cd 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -372,4 +372,36 @@
<entry key='ardi01.enable'>true</entry>
<entry key='ardi01.port'>5075</entry>
+ <!-- XT013 server configuration -->
+ <entry key='xt013.enable'>true</entry>
+ <entry key='xt013.port'>5076</entry>
+
+ <!-- AutoFon server configuration -->
+ <entry key='autofon.enable'>true</entry>
+ <entry key='autofon.port'>5077</entry>
+
+ <!-- GoSafe server configuration -->
+ <entry key='gosafe.enable'>true</entry>
+ <entry key='gosafe.port'>5078</entry>
+
+ <!-- AutoFon 4.5 server configuration -->
+ <entry key='autofon45.enable'>true</entry>
+ <entry key='autofon45.port'>5079</entry>
+
+ <!-- BCE server configuration -->
+ <entry key='bce.enable'>true</entry>
+ <entry key='bce.port'>5080</entry>
+
+ <!-- Xirgo server configuration -->
+ <entry key='xirgo.enable'>true</entry>
+ <entry key='xirgo.port'>5081</entry>
+
+ <!-- CalAmp server configuration -->
+ <entry key='calamp.enable'>true</entry>
+ <entry key='calamp.port'>5082</entry>
+
+ <!-- MTX server configuration -->
+ <entry key='mtx.enable'>true</entry>
+ <entry key='mtx.port'>5083</entry>
+
</properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 32d26ce00..bf1a082cd 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -372,4 +372,36 @@
<entry key='ardi01.enable'>true</entry>
<entry key='ardi01.port'>5075</entry>
+ <!-- XT013 server configuration -->
+ <entry key='xt013.enable'>true</entry>
+ <entry key='xt013.port'>5076</entry>
+
+ <!-- AutoFon server configuration -->
+ <entry key='autofon.enable'>true</entry>
+ <entry key='autofon.port'>5077</entry>
+
+ <!-- GoSafe server configuration -->
+ <entry key='gosafe.enable'>true</entry>
+ <entry key='gosafe.port'>5078</entry>
+
+ <!-- AutoFon 4.5 server configuration -->
+ <entry key='autofon45.enable'>true</entry>
+ <entry key='autofon45.port'>5079</entry>
+
+ <!-- BCE server configuration -->
+ <entry key='bce.enable'>true</entry>
+ <entry key='bce.port'>5080</entry>
+
+ <!-- Xirgo server configuration -->
+ <entry key='xirgo.enable'>true</entry>
+ <entry key='xirgo.port'>5081</entry>
+
+ <!-- CalAmp server configuration -->
+ <entry key='calamp.enable'>true</entry>
+ <entry key='calamp.port'>5082</entry>
+
+ <!-- MTX server configuration -->
+ <entry key='mtx.enable'>true</entry>
+ <entry key='mtx.port'>5083</entry>
+
</properties>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 0f91922e3..d239ed269 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -372,4 +372,36 @@
<entry key='ardi01.enable'>true</entry>
<entry key='ardi01.port'>5075</entry>
+ <!-- XT013 server configuration -->
+ <entry key='xt013.enable'>true</entry>
+ <entry key='xt013.port'>5076</entry>
+
+ <!-- AutoFon server configuration -->
+ <entry key='autofon.enable'>true</entry>
+ <entry key='autofon.port'>5077</entry>
+
+ <!-- GoSafe server configuration -->
+ <entry key='gosafe.enable'>true</entry>
+ <entry key='gosafe.port'>5078</entry>
+
+ <!-- AutoFon 4.5 server configuration -->
+ <entry key='autofon45.enable'>true</entry>
+ <entry key='autofon45.port'>5079</entry>
+
+ <!-- BCE server configuration -->
+ <entry key='bce.enable'>true</entry>
+ <entry key='bce.port'>5080</entry>
+
+ <!-- Xirgo server configuration -->
+ <entry key='xirgo.enable'>true</entry>
+ <entry key='xirgo.port'>5081</entry>
+
+ <!-- CalAmp server configuration -->
+ <entry key='calamp.enable'>true</entry>
+ <entry key='calamp.port'>5082</entry>
+
+ <!-- MTX server configuration -->
+ <entry key='mtx.enable'>true</entry>
+ <entry key='mtx.port'>5083</entry>
+
</properties>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 4d8ab7af5..f25d7da46 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=Traccar
-AppVersion=2.11
+AppVersion=2.12
DefaultDirName={pf}\Traccar
AlwaysRestart=yes