Merge branch 'master' into dev

vitalidze · Jan 20, 2015 · 8f2fc5b · 8f2fc5b
2 parents 7eddc45 + c11180a
commit 8f2fc5b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>org.traccar</groupId>
   <artifactId>traccar-web</artifactId>
   <packaging>war</packaging>
-  <version>2.10-SNAPSHOT</version>
+  <version>2.11-SNAPSHOT</version>
   <name>Traccar Web UI</name>
 
   <properties>
@@ -87,13 +87,13 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.4.180</version>
+      <version>1.4.184</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
        <groupId>mysql</groupId>
        <artifactId>mysql-connector-java</artifactId>
-       <version>5.1.31</version>
+       <version>5.1.34</version>
        <scope>provided</scope>
     </dependency>
     <dependency>
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <!-- Other dependencies -->