summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTschaen, Brendan <ctschaen@att.com>2020-03-24 17:07:00 -0400
committerTschaen, Brendan <ctschaen@att.com>2020-03-24 17:16:02 -0400
commit2fb68aa6fc8e8d15d65c26505b3bd4a278b778ca (patch)
tree0b1865f0263fad3024633ee1141ab5b45f910345
parent951bc7766db712678c77bdbad11e9f362d4679c6 (diff)
Exclude jax-rs 1, force jax-rs 2
Issue-ID: MUSIC-561 Signed-off-by: Tschaen, Brendan <ctschaen@att.com> Change-Id: I55fc7bf1bbbbdd4fc0b5d62276ba77c9ae81260d
-rwxr-xr-xmusic-core/pom.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/music-core/pom.xml b/music-core/pom.xml
index 8327bf4e..a1fc3a61 100755
--- a/music-core/pom.xml
+++ b/music-core/pom.xml
@@ -271,7 +271,6 @@
<scope>test</scope>
</dependency>
<!-- /Testing -->
-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -320,6 +319,18 @@
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<version>1.19</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>