Code Review
/
music.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove duplicated jaxrs library
[music.git]
/
music-rest
/
pom.xml
diff --git
a/music-rest/pom.xml
b/music-rest/pom.xml
index
9a5ad21
..
84e86ed
100755
(executable)
--- a/
music-rest/pom.xml
+++ b/
music-rest/pom.xml
@@
-88,6
+88,7
@@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
+ <scope>provided</scope>
</dependency>
<!-- Springboot -->
<dependency>
</dependency>
<!-- Springboot -->
<dependency>
@@
-150,6
+151,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>