From: Xue Gao <xg353y@intl.att.com>
Date: Fri, 27 Mar 2020 12:07:39 +0000 (+0000)
Subject: Merge "Fix frontend docker"
X-Git-Tag: 5.0.1~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ea4cfafbfbd427f46254bd51dee22785270fa551;hp=-c;p=clamp.git

Merge "Fix frontend docker"
---

ea4cfafbfbd427f46254bd51dee22785270fa551
diff --combined pom.xml
index a77f9d9c,7f93b580..e14aef5d
--- a/pom.xml
+++ b/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<groupId>org.onap.clamp</groupId>
  	<artifactId>clds</artifactId>
- 	<version>5.0.0-SNAPSHOT</version>
+ 	<version>5.0.1-SNAPSHOT</version>
  	<name>clamp</name>
  
  
@@@ -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>