From: Xue Gao <xg353y@intl.att.com>
Date: Wed, 25 Mar 2020 12:11:57 +0000 (+0000)
Subject: Merge "Improve metadata support"
X-Git-Tag: 5.0.0~7
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f152e38d8120333a2572d0b785f4e68aedc92a04;hp=-c;p=clamp.git

Merge "Improve metadata support"
---

f152e38d8120333a2572d0b785f4e68aedc92a04
diff --combined pom.xml
index 02ac6ddd,04ab4cb4..b9abc4f1
--- a/pom.xml
+++ b/pom.xml
@@@ -76,8 -76,8 +76,8 @@@
  		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  
  		<eelf.core.version>1.0.0</eelf.core.version>
- 		<camel.version>2.24.0</camel.version>
- 		<springboot.version>2.2.0.RELEASE</springboot.version>
+ 		<camel.version>2.25.0</camel.version>
+ 		<springboot.version>2.2.5.RELEASE</springboot.version>
  
  		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
  		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@@ -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>
@@@ -878,9 -874,7 +878,7 @@@
  			<plugin>
  				<groupId>org.springframework.boot</groupId>
  				<artifactId>spring-boot-maven-plugin</artifactId>
- 				<!-- Temporary fix -->
- 				<version>1.5.13.RELEASE</version>
- 				<!-- <version>${springboot.version}</version> -->
+ 				<version>${springboot.version}</version>
  				<executions>
  					<execution>
  						<goals>