diff options
| author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
|---|---|---|
| committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
| commit | 4606737cc07b736f9c8f98ae680b928c94c082c8 (patch) | |
| tree | bdd29b24a16403b1e8a3d7cd4325391063b34b8a /pom.xml | |
| parent | 3ced99384b1967f5cde9abdf30c1c0184a5ae3f6 (diff) | |
| parent | ab5d21e16ac44957e04da0f06daf148af95e96be (diff) | |
| download | trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.gz trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.bz2 trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -4,15 +4,15 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.traccar</groupId> <artifactId>traccar</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> <name>traccar</name> <url>https://www.traccar.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jetty.version>9.2.14.v20151106</jetty.version> <!-- Jetty 9.3+ requires Java 8 --> - <jersey.version>2.22.1</jersey.version> + <jetty.version>9.2.15.v20160210</jetty.version> <!-- Jetty 9.3+ requires Java 8 --> + <jersey.version>2.22.2</jersey.version> </properties> <dependencies> @@ -30,12 +30,12 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.9.1</version> + <version>2.9.2</version> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.190</version> + <version>1.4.191</version> </dependency> <dependency> <groupId>mysql</groupId> @@ -45,7 +45,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.4-1206-jdbc41</version> + <version>9.4.1208.jre7</version> </dependency> <dependency> <groupId>com.mchange</groupId> @@ -60,12 +60,12 @@ <dependency> <groupId>com.ning</groupId> <!-- org.asynchttpclient starting from version 2.0 --> <artifactId>async-http-client</artifactId> - <version>1.9.31</version> + <version>1.9.33</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.7.13</version> + <version>1.7.18</version> </dependency> <dependency> <groupId>org.glassfish</groupId> @@ -164,7 +164,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> + <version>3.5.1</version> <configuration> <source>1.7</source> <target>1.7</target> |