diff options
| author |   Thomas Nelson <tn1381@att.com> | 2020-03-09 16:18:52 -0400 |
|---|---|---|
| committer | Thomas Nelson <tn1381@att.com> | 2020-03-09 16:18:52 -0400 |
| commit | 822ddd979e4c1ca49c2373c16c15a8375e1aae88 (patch) | |
| tree | a61a1e1d78cc9a4c878b1b3c32e133dce30368c8 | |
| parent | 84ca96a175ba40f0dced5845cdd28f925ec3fd97 (diff) | |
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
| -rwxr-xr-x | music-core/pom.xml | 12 | ||||
| -rwxr-xr-x | music-rest/pom.xml | 9 | ||||
| -rwxr-xr-x | pom.xml | 12 |
3 files changed, 25 insertions, 8 deletions
diff --git a/music-core/pom.xml b/music-core/pom.xml index cd1930ec..a45e98c6 100755 --- 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 7d407e61..50e5fcaa 100755 --- 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> @@ -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> |