diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-01 15:20:05 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-01 15:20:05 +1300 |
| commit | ef2ae4103726dae12a0153886219d4ac43d20ae0 (patch) | |
| tree | 79291f74ce2631a4a9a176b7e510028e534a23d4 /pom.xml | |
| parent | c6692703c8099577cb86c3eace5d8d1bc11f212d (diff) | |
| parent | 53f70085891cdb0feae56df8990c1245091352a1 (diff) | |
| download | trackermap-server-ef2ae4103726dae12a0153886219d4ac43d20ae0.tar.gz trackermap-server-ef2ae4103726dae12a0153886219d4ac43d20ae0.tar.bz2 trackermap-server-ef2ae4103726dae12a0153886219d4ac43d20ae0.zip | |
Merge branch 'rest' into master
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,5 @@ <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"> + 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> @@ -12,6 +12,7 @@ <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> </properties> <dependencies> @@ -91,6 +92,16 @@ <artifactId>jetty-jndi</artifactId> <version>${jetty.version}</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet</artifactId> + <version>${jersey.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-moxy</artifactId> + <version>${jersey.version}</version> + </dependency> </dependencies> <build> @@ -183,7 +194,7 @@ <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.8.1</version> <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> + <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration> </plugin> <plugin> |