Merge "Improve metadata support"

diff --combined pom.xml
index 02ac6dd,04ab4cb..b9abc4f
--- 1/pom.xml
--- 2/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>