aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-11-03 10:49:13 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2014-11-03 10:49:13 +1300
commit19036fd6e89f9ee6676e759359da611e782b85c7 (patch)
tree29db3de9512b21590e28d2ad28eea838f15de7c6
parent392b92eeaab4023b74cebfcbb9efc4b6931a3852 (diff)
downloadtrackermap-server-19036fd6e89f9ee6676e759359da611e782b85c7.tar.gz
trackermap-server-19036fd6e89f9ee6676e759359da611e782b85c7.tar.bz2
trackermap-server-19036fd6e89f9ee6676e759359da611e782b85c7.zip
Version 2.10 releasev2.10
-rw-r--r--pom.xml16
-rw-r--r--setup/linux/traccar.cfg1
-rw-r--r--setup/macosx/traccar.cfg1
-rw-r--r--setup/windows/traccar.cfg1
-rw-r--r--setup/windows/traccar.iss2
5 files changed, 9 insertions, 12 deletions
diff --git a/pom.xml b/pom.xml
index dfe20bf10..bc72edc76 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.9-SNAPSHOT</version>
+ <version>2.10-SNAPSHOT</version>
<name>traccar</name>
<url>http://www.traccar.org</url>
@@ -23,12 +23,12 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.180</version>
+ <version>1.4.181</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.31</version>
+ <version>5.1.33</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
@@ -43,12 +43,12 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.9.2.Final</version>
+ <version>3.9.5.Final</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
- <version>8.1.15.v20140411</version>
+ <version>8.1.16.v20140903</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -75,7 +75,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<executions>
<execution>
<phase>package</phase>
@@ -106,7 +106,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.5</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 75dd55356..2efa7931a 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -6,7 +6,6 @@
<!-- Global configuration -->
<entry key='database.driver'>org.h2.Driver</entry>
- <entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
<entry key='database.url'>jdbc:h2:/opt/traccar/data/database</entry>
<entry key='database.user'>sa</entry>
<entry key='database.password'></entry>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 75dd55356..2efa7931a 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -6,7 +6,6 @@
<!-- Global configuration -->
<entry key='database.driver'>org.h2.Driver</entry>
- <entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
<entry key='database.url'>jdbc:h2:/opt/traccar/data/database</entry>
<entry key='database.user'>sa</entry>
<entry key='database.password'></entry>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 379f50ecf..5e5858992 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -6,7 +6,6 @@
<!-- Global configuration -->
<entry key='database.driver'>org.h2.Driver</entry>
- <entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
<entry key='database.url'>jdbc:h2:[DATABASE]</entry>
<entry key='database.user'>sa</entry>
<entry key='database.password'></entry>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index b827807d7..a1f1cca51 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=Traccar
-AppVersion=2.9
+AppVersion=2.10
DefaultDirName={pf}\Traccar
AlwaysRestart=yes