Default Cipher to empty string

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

diff --git a/music-rest/pom.xml b/music-rest/pom.xml
index 84e86ed..9bcfd39 100755 (executable)
--- a/music-rest/pom.xml
+++ b/music-rest/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.onap.music</groupId>
     <artifactId>MUSIC-rest</artifactId>
     <packaging>jar</packaging>
-    <version>3.2.37-SNAPSHOT</version>
+    <version>3.2.40-SNAPSHOT</version>
     <description>
             This is the MUSIC Spring-based REST service.
     </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>
@@ -83,14 +83,7 @@
     </dependencyManagement>
 
     <dependencies>
-        <!-- Development -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Springboot -->
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -134,13 +127,19 @@
         <dependency>
           <groupId>org.onap.music</groupId>
           <artifactId>MUSIC-core</artifactId>
-          <version>3.2.37-SNAPSHOT</version>
+          <version>3.2.40-SNAPSHOT</version>
         </dependency>
         <!-- Jersey -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-client</artifactId>
             <version>${jersey1.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -229,6 +228,12 @@
                     <outputDirectory>${project.basedir}/distribution/music/</outputDirectory>
                     <addResources>true</addResources>
                     <finalName>MUSIC-SB</finalName>
+                    <excludes>
+                      <exclude>
+                        <groupId>javax.ws.rs</groupId>
+                        <artifactId>jsr311-api</artifactId>
+                      </exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>