Skip to content

Commit

Permalink
Version 2.12 release
Browse files Browse the repository at this point in the history
  • Loading branch information
tananaev committed Apr 17, 2015
1 parent 04ae68b commit b068ca9
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 9 deletions.
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -75,7 +75,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.9</version>
<version>2.10</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
32 changes: 32 additions & 0 deletions setup/linux/traccar.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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>
32 changes: 32 additions & 0 deletions setup/macosx/traccar.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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>
32 changes: 32 additions & 0 deletions setup/windows/traccar.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion setup/windows/traccar.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Setup]
AppName=Traccar
AppVersion=2.11
AppVersion=2.12
DefaultDirName={pf}\Traccar
AlwaysRestart=yes

Expand Down

0 comments on commit b068ca9

Please sign in to comment.