From: Xue Gao <xg353y@intl.att.com>
Date: Wed, 25 Mar 2020 12:12:08 +0000 (+0000)
Subject: Merge "Improve the policy model download"
X-Git-Tag: 5.0.0~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2dcca5a5b563e7640313e93fe617ca89bf6aa6d6;hp=-c;p=clamp.git

Merge "Improve the policy model download"
---

2dcca5a5b563e7640313e93fe617ca89bf6aa6d6
diff --combined pom.xml
index b9abc4f1,34054da0..f30fe85a
--- a/pom.xml
+++ b/pom.xml
@@@ -99,7 -99,7 +99,7 @@@
  		<docker.skip.tag>true</docker.skip.tag>
  		<skip.staging.artifacts>false</skip.staging.artifacts>
  		<python.http.proxy.param />
 -		<tomcat.version>9.0.27</tomcat.version>
 +		<tomcat.version>9.0.33</tomcat.version>
  		<ui.react.src>ui-react</ui.react.src>
  		<ui.react.lib.src>ui-react-lib</ui.react.lib.src>
  		<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
@@@ -428,10 -428,6 +428,10 @@@
  					<groupId>javax.servlet</groupId>
  					<artifactId>servlet-api</artifactId>
  				</exclusion>
 +				<exclusion>
 +					<groupId>log4j</groupId>
 +					<artifactId>log4j</artifactId>
 +				</exclusion>
  			</exclusions>
  		</dependency>
  		<dependency>
@@@ -534,6 -530,11 +534,11 @@@
  			<artifactId>sdc-tosca</artifactId>
  			<version>1.5.1</version>
  		</dependency>
+ 		<dependency>
+ 			<groupId>org.yaml</groupId>
+ 			<artifactId>snakeyaml</artifactId>
+ 			<version>1.26</version>
+ 		</dependency>
  		<!-- TESTING -->
  		<dependency>
  			<groupId>org.assertj</groupId>