From: Christophe Closset <christophe.closset@intl.att.com>
Date: Wed, 25 Mar 2020 14:57:00 +0000 (+0000)
Subject: Merge "Fix the stage builds"
X-Git-Tag: 5.0.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4de90de028ffefb93aa67d364edffa5edd58d33c;hp=-c;p=clamp.git

Merge "Fix the stage builds"
---

4de90de028ffefb93aa67d364edffa5edd58d33c
diff --combined pom.xml
index f30fe85a,bc42a54f..9f759e11
--- 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>
@@@ -1232,6 -1228,7 +1232,7 @@@
  						</goals>
  						<phase>deploy</phase>
  						<configuration>
+ 							<skip>true</skip>
  							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
  							<arguments>publish</arguments>
  						</configuration>