From: Tschaen, Brendan <ctschaen@att.com>
Date: Tue, 24 Mar 2020 21:07:00 +0000 (-0400)
Subject: Exclude jax-rs 1, force jax-rs 2
X-Git-Tag: 3.2.38~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=music.git;a=commitdiff_plain;h=2fb68aa6fc8e8d15d65c26505b3bd4a278b778ca

Exclude jax-rs 1, force jax-rs 2

Issue-ID: MUSIC-561
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Change-Id: I55fc7bf1bbbbdd4fc0b5d62276ba77c9ae81260d
---

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>