Code Review
/
music.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use v1.19 of jersey-multipath
[music.git]
/
music-rest
/
pom.xml
diff --git
a/music-rest/pom.xml
b/music-rest/pom.xml
index
9a5ad21
..
b5498f1
100755
(executable)
--- a/
music-rest/pom.xml
+++ b/
music-rest/pom.xml
@@
-83,13
+83,7
@@
</dependencyManagement>
<dependencies>
</dependencyManagement>
<dependencies>
- <!-- Development -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
- </dependency>
- <!-- Springboot -->
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@
-150,6
+144,12
@@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>${jersey1.version}</version>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>${jersey1.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>