From b9f0e8feb92df1c9e2906f23a9a613150b4c91b4 Mon Sep 17 00:00:00 2001
From: Mukesh Paliwal <mukesh.paliwal1@huawei.com>
Date: Thu, 24 Jun 2021 09:50:22 +0530
Subject: [PATCH] Mapper security vulnerability updates

Issue-ID: DCAEGEN2-2806

Signed-off-by: Mukesh Paliwal <mukesh.paliwal1@huawei.com>
Change-Id: Id4ac49385838e1be20263002da1bcc666c1839a0
---
 Changelog.md                |  4 ++++
 UniversalVesAdapter/pom.xml | 10 +++++-----
 pom.xml                     |  4 ++--
 version.properties          |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b3cd5c9..e3a0026 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@ 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.0] - 05/07/2021
+### Changed
+	- [DCAEGEN2-2806](https://jira.onap.org/browse/DCAEGEN2-2806) - Mapper security vulnerability updates for Istanbul
+
 ## [1.2.0] - 08/02/2021
 ### Changed
 	- [DCAEGEN2-2596](https://jira.onap.org/browse/DCAEGEN2-2596) - Honolulu Vulnerability updates
diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index 5488f3f..b5b04fc 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -27,13 +27,13 @@
 
 	<groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>
 	<artifactId>UniversalVesAdapter</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 
 	<parent>
 		<groupId>org.onap.dcaegen2.services.mapper</groupId>
 		<artifactId>mapper</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -197,12 +197,12 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.13.3</version>
+			<version>2.14.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-all</artifactId>
-			<version>2.4.14</version>
+			<version>2.4.21</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
@@ -242,7 +242,7 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
-			<version>1.4.11.1</version>
+			<version>1.4.16</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 507bbd4..43f7a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.onap.dcaegen2.services.mapper</groupId>
     <artifactId>mapper</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>dcaegen2-services-mapper</name>
@@ -68,7 +68,7 @@
 
         <json.path.version>2.2.0</json.path.version>
         <quartz.version>2.2.0</quartz.version>
-        <httpclient.version>4.5.6</httpclient.version>
+        <httpclient.version>4.5.13</httpclient.version>
         <commons.lang3.version>3.5</commons.lang3.version>
 
         <docker.maven.version>1.0.0</docker.maven.version>
diff --git a/version.properties b/version.properties
index 07578e5..f520c97 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 major=1
-minor=2
+minor=3
 patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
-- 
2.16.6