From ca168146e760801c7fc2f810cc05a7a092b74bdf Mon Sep 17 00:00:00 2001
From: vv770d <vv770d@att.com>
Date: Tue, 18 Jan 2022 22:04:55 +0000
Subject: Remediation for Log4Shell vulnerability

Upgrade log4j to 2.17.1

Change-Id: Id8b9978d2d79e82adc183a8e7e9565b68905bb87
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-3022
Signed-off-by: vv770d <vv770d@att.com>
---
 Changelog.md       |  5 ++++-
 pom.xml            | 10 +++++-----
 version.properties |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 65f42c4..4d716b2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,8 +4,11 @@ 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.2.7] - 2022/01/18
+         - [DCAEGEN2-3022] - Remediation for Log4Shell vulnerability (upgrade to 2.17.1)
+
 ## [1.2.6] - 2021/12/14
-         - [DCAEGEN2-3022] - Remediation for Log4Shell vulnerability
+         - [DCAEGEN2-3022] - Remediation for Log4Shell vulnerability (upgrade to 2.16.0)
 
 ## [1.2.5] - 19/03/2021
 ### Fixed
diff --git a/pom.xml b/pom.xml
index 6349069..dff9d17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
-================================================================================
+============LICENSE_START=======================================================
 Copyright (c) 2019 Huawei. All rights reserved.
-Copyright (c) 2019,2021 AT&T. All rights reserved.
+Copyright (c) 2019,2021-2022 AT&T. 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.
@@ -27,7 +27,7 @@ limitations under the License.
     </parent>
     <groupId>org.onap.dcaegen2.collectors.restconf</groupId>
     <artifactId>restconfcollector</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>dcaegen2-collectors-restconf</name>
     <description>RestConfCollector</description>
     <properties>
@@ -446,12 +446,12 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.16.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.16.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
diff --git a/version.properties b/version.properties
index 0cb18ba..b869f98 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=2
-patch=6
+patch=7
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg