diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
| commit | 7310ee5f15729ea8517bfb6b0890a46da1217610 (patch) | |
| tree | 44504738f127708420179a7dbbe2942cb67d0849 /pom.xml | |
| parent | 8e8da7019aab023ae255d0ed6d16b94d303fd468 (diff) | |
| parent | 0a6faa86c4b634fa3a94633506c4422623e36f1e (diff) | |
| download | trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.gz trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.bz2 trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.zip | |
Merge Java 7 update (fix #1273)
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 21 |
1 files changed, 9 insertions, 12 deletions
@@ -1,5 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <groupId>org.traccar</groupId> <artifactId>traccar</artifactId> @@ -28,12 +29,12 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.35</version> + <version>5.1.36</version> </dependency> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.3-1103-jdbc4</version> + <version>9.4-1201-jdbc41</version> </dependency> <dependency> <groupId>com.mchange</groupId> @@ -57,18 +58,13 @@ </dependency> <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all-server</artifactId> - <version>8.1.17.v20150415</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.mail.glassfish</artifactId> - </exclusion> - </exclusions> + <artifactId>jetty-all</artifactId> + <version>9.2.11.v20150529</version> </dependency> </dependencies> <build> + <finalName>tracker-server</finalName> <outputDirectory>target/classes</outputDirectory> <sourceDirectory>src</sourceDirectory> @@ -120,8 +116,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.3</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> @@ -151,4 +147,5 @@ </plugins> </build> + </project> |