More changes to get MUSIC working

Issues running in K8s

Issue-ID: MUSIC-574
Signed-off-by: Thomas Nelson <tn1381@att.com>
Change-Id: Iba46fec48ad4c5710990328f43ac63bdf5e4b870

diff --git a/music-core/pom.xml b/music-core/pom.xml
index cd1930e..a45e98c 100755 (executable)
--- a/music-core/pom.xml
+++ b/music-core/pom.xml
@@ -356,11 +356,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>

diff --git a/music-rest/pom.xml b/music-rest/pom.xml
index 7d407e6..50e5fca 100755 (executable)
--- a/music-rest/pom.xml
+++ b/music-rest/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
index 51c12f9..baf1bd9 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,18 @@
         <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
+    <dependencies>
+        <!-- Development -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Springboot -->
+    </dependencies>
+
+
     <repositories>
         <repository>
             <id>onap-releases</id>