From: Sébastien Determe <sebastien.determe@intl.att.com>
Date: Fri, 27 Mar 2020 18:10:46 +0000 (+0000)
Subject: Merge "Release Frankfurt 5.0.0"
X-Git-Tag: 5.0.1~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c5fef2bba60c7f7c5c2da01ff2359f7c9376af13;hp=-c;p=clamp.git

Merge "Release Frankfurt 5.0.0"
---

c5fef2bba60c7f7c5c2da01ff2359f7c9376af13
diff --combined pom.xml
index e14aef5d,75c22bbe..3768649a
--- 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>
@@@ -366,6 -366,11 +366,11 @@@
  				</exclusion>
  			</exclusions>
  		</dependency>
+ 		<dependency>
+ 			<groupId>javax.xml.ws</groupId>
+ 			<artifactId>jaxws-api</artifactId>
+ 			<version>2.3.1</version>
+ 		</dependency>
  		<dependency>
  			<groupId>javax.xml.bind</groupId>
  			<artifactId>jaxb-api</artifactId>
@@@ -428,10 -433,6 +433,10 @@@
  					<groupId>javax.servlet</groupId>
  					<artifactId>servlet-api</artifactId>
  				</exclusion>
 +				<exclusion>
 +					<groupId>log4j</groupId>
 +					<artifactId>log4j</artifactId>
 +				</exclusion>
  			</exclusions>
  		</dependency>
  		<dependency>