Merge "JUNITS for JSONDELETE class"

[music.git] / music-core / pom.xml

diff --git a/music-core/pom.xml b/music-core/pom.xml
index cd1930e..cf7f59e 100755 (executable)
--- a/music-core/pom.xml
+++ b/music-core/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC-core</artifactId>
     <packaging>jar</packaging>
-    <version>3.2.37-SNAPSHOT</version>
+    <version>3.2.40-SNAPSHOT</version>
     <description>
             This is the MUSIC core interface, packaged as a jar file.
     </description>
@@ -36,7 +36,7 @@
     <parent>
         <groupId>org.onap.music</groupId>
         <artifactId>MUSIC</artifactId>
-        <version>3.2.37-SNAPSHOT</version>
+        <version>3.2.40-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -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>
@@ -301,6 +300,37 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey-jaxrs</artifactId>
             <version>1.5.22</version>
+            <exclusions>
+              <exclusion>
+                <groupId>com.sun.jersey.contribs</groupId>
+                <artifactId>jersey-multipart</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+                       <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>
@@ -356,11 +386,23 @@
             <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-client</artifactId>
             <version>2.1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>        
         </dependency>
         <dependency>
             <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-core</artifactId>
             <version>2.1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>