Upgrade embeded Tomcat

Address VESCollector vulnerability reported R3 RC1 phase

Change-Id: I78b82bd793bf59e13636b5534fabe484025071d9
Issue-ID: DCAEGEN2-927
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>

diff --git a/pom.xml b/pom.xml
index fd1269b..c434788 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -308,20 +308,10 @@ limitations under the License.
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.0.3.RELEASE</version>
+                <version>2.1.0.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-                       <dependency>
-                               <groupId>org.apache.tomcat.embed</groupId>
-                               <artifactId>tomcat-embed-core</artifactId>
-                               <version>8.5.32</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.tomcat.embed</groupId>
-                               <artifactId>tomcat-embed-el</artifactId>
-                               <version>8.5.32</version>
-                       </dependency>               
         </dependencies>
     </dependencyManagement>
     <dependencies>

diff --git a/src/main/java/org/onap/dcae/ApplicationSettings.java b/src/main/java/org/onap/dcae/ApplicationSettings.java
index 865b0d1..189d4a9 100644 (file)
--- a/src/main/java/org/onap/dcae/ApplicationSettings.java
+++ b/src/main/java/org/onap/dcae/ApplicationSettings.java
@@ -54,7 +54,6 @@ import static java.util.Arrays.stream;
  * Abstraction over application configuration.
  * Its job is to provide easily discoverable (by method names lookup) and type safe access to configuration properties.
  */
-@Component
 public class ApplicationSettings {
 
     private static final Logger log = LoggerFactory.getLogger(ApplicationSettings.class);