From 96391c071bb37549a015ff56c1687692ea74719e Mon Sep 17 00:00:00 2001
From: vv770d <vv770d@att.com>
Date: Tue, 14 Dec 2021 23:45:02 +0000
Subject: [DCAE/vesmapper] Remediation for Log4Shell vulnerability

Change-Id: Ic37ca7cb91793b3bfb6d132ea3cfedff2c2f32e8
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-3022
---
 Changelog.md                |  2 ++
 UniversalVesAdapter/pom.xml | 14 ++++++++++----
 pom.xml                     |  3 ++-
 version.properties          |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6518d2f..c1e4124 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,8 @@ 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.3.1] - 2021/12/14
+         - [DCAEGEN2-3022] - Remediation for Log4Shell vulnerability
 
 ## [1.3.0] - 2021/08/26
 	- [DCAEGEN2-2806] Mapper security vulnerability updates for Istanbul
diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index 1d9f955..111e2e2 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -5,6 +5,7 @@
 * ================================================================================
 * Copyright 2018-2019 TechMahindra
 * Copyright (C) 2020 Huawei Technologies Co., Ltd.
+* Copyright (c) 2021 AT&T Intellectual Property. 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,13 +28,13 @@
 
 	<groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>
 	<artifactId>UniversalVesAdapter</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 
 
 	<parent>
 		<groupId>org.onap.dcaegen2.services.mapper</groupId>
 		<artifactId>mapper</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -197,7 +198,12 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.14.1</version>
+			<version>2.16.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.16.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
@@ -428,4 +434,4 @@
 			<url>https://repo.spring.io/libs-release</url>
 		</pluginRepository>
 	</pluginRepositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 43f7a5f..aece60e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,6 +5,7 @@
 * ================================================================================
 * Copyright 2018-2019 TechMahindra
 * Copyright (C) 2020 Huawei Technologies Co., Ltd.
+* Copyright (c) 2021 AT&T Intellectual Property. 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.
@@ -31,7 +32,7 @@
 
     <groupId>org.onap.dcaegen2.services.mapper</groupId>
     <artifactId>mapper</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>dcaegen2-services-mapper</name>
diff --git a/version.properties b/version.properties
index f520c97..46bf259 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=3
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg