From 52804064a9518ef398e7c547644098b0263c9882 Mon Sep 17 00:00:00 2001
From: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Date: Fri, 11 Feb 2022 12:55:30 +0100
Subject: Remove vulnerability

- bump Spring version from 5.3.6 to 5.3.14
- tomcat-embed-core version bump from 9.0.50 to 9.0.56
- bump SDK version from 1.8.7 to 1.8.8

Issue-ID: DCAEGEN2-3041
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: Iac4b0aaf51de0d3dd3e585998ecfc6425015ea6a
---
 Changelog.md                | 6 ++++++
 datafile-app-server/pom.xml | 6 +++---
 pom.xml                     | 8 ++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 17c55436..b20a9302 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.7.0] - 2022/02/14
+### Changed
+- [DCAEGEN2-3041] Spring version bump from 5.3.6 to 5.3.14
+- tomcat-embed-core version bump from 9.0.50 to 9.0.56
+- SDK version bump from 1.8.7 to 1.8.8
+
 ## [1.6.1] - 2021/08/24
 ### Changed
 - SDK version bump from 1.5.0 to 1.8.7 in order to enable config file support
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml
index 3d8097ee..4e462717 100644
--- a/datafile-app-server/pom.xml
+++ b/datafile-app-server/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ ============LICENSE_START=======================================================
-  ~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+  ~ Copyright (C) 2018-2022 NOKIA Intellectual Property. All rights reserved.
   ~ Copyright (C) 2018-2021 Nordix Foundation. All rights reserved.
   ~ Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
   ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors</groupId>
         <artifactId>datafile</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.dcaegen2.collectors.datafile</groupId>
@@ -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.50</tomcat-embed-core.version>
+        <tomcat-embed-core.version>9.0.56</tomcat-embed-core.version>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 96393ea9..c857d7eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ ============LICENSE_START=====================================================================
-  ~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+  ~ Copyright (C) 2018-2022 NOKIA Intellectual Property. All rights reserved.
   ~ Copyright (C) 2018-2021 Nordix Foundation. All rights reserved.
   ~ Copyright (C) 2021 Samsung Electronics. All rights reserved.
   ~ ==============================================================================================
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.dcaegen2.collectors</groupId>
     <artifactId>datafile</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>dcaegen2-collectors.datafile</name>
     <description>datafile collector</description>
@@ -51,11 +51,11 @@
 
     <properties>
         <java.version>11</java.version>
-        <sdk.version>1.8.7</sdk.version>
+        <sdk.version>1.8.8</sdk.version>
         <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.6</spring.version>
+        <spring.version>5.3.14</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>
-- 
cgit 1.2.3-korg