From c5a8cd47b1e045b3acf44b684d304ede1471716a Mon Sep 17 00:00:00 2001
From: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Date: Fri, 16 Jul 2021 13:53:41 +0200
Subject: DFC security vulnerability updates

- tomcat-embed-core: 9.0.39 -> 9.0.50
- spring: 5.3.1 -> 5.3.6
- spring-boot: 2.4.0 -> 2.4.5

Issue-ID: DCAEGEN2-2804
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: I59568543048602a21ff6e89b44bbb57c5351688a
---
 Changelog.md                                            |  3 +++
 datafile-app-server/pom.xml                             |  2 +-
 .../datafile/http/HttpClientResponseHelper.java         | 17 ++++++++++++++++-
 pom.xml                                                 |  4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0dc2c456..46469958 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - docker base image to integration (from debian based to alpine based)
 - java version bump from 11.0.8 to 11.0.9
 - remove exec file permission for config file
+- tomcat-embed-core version bump from 9.0.39 to 9.0.50
+- spring version bump from 5.3.1 to 5.3.6
+- spring-boot version bump from 2.4.0 to 2.4.5
 
 ## [1.5.5] - 09/03/2021
 ### Fixed
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml
index 4b84f6ed..75fdabf3 100644
--- a/datafile-app-server/pom.xml
+++ b/datafile-app-server/pom.xml
@@ -38,7 +38,7 @@
         <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
         <docker-client.version>8.7.1</docker-client.version>
-        <tomcat-embed-core.version>9.0.39</tomcat-embed-core.version>
+        <tomcat-embed-core.version>9.0.50</tomcat-embed-core.version>
     </properties>
 
     <dependencies>
diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java
index 0d52858d..22067d0b 100644
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java
+++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START======================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 Nokia. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -63,11 +63,21 @@ public class HttpClientResponseHelper {
             return null;
         }
 
+        @Override
+        public String path() {
+            return null;
+        }
+
         @Override
         public String fullPath() {
             return null;
         }
 
+        @Override
+        public String requestId() {
+            return null;
+        }
+
         @Override
         public String uri() {
             return null;
@@ -141,6 +151,11 @@ public class HttpClientResponseHelper {
             return null;
         }
 
+        @Override
+        public String requestId() {
+            return null;
+        }
+
         @Override
         public String uri() {
             return null;
diff --git a/pom.xml b/pom.xml
index e9aa77b6..4d253098 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
         <apache.httpcomponents.version>4.1.4</apache.httpcomponents.version>
         <apache.commons.version>3.6</apache.commons.version>
         <immutable.version>2.7.1</immutable.version>
-        <spring.version>5.3.1</spring.version>
-        <spring-boot.version>2.4.0</spring-boot.version>
+        <spring.version>5.3.6</spring.version>
+        <spring-boot.version>2.4.5</spring-boot.version>
         <commons-io.version>2.8.0</commons-io.version>
         <commons-net.version>3.3</commons-net.version>
         <projectreactor.version>2020.0.2</projectreactor.version>
-- 
cgit 1.2.3-korg