From 26976e884968080ef94266a8fa6f72687558e8fc Mon Sep 17 00:00:00 2001
From: pranitk1905 <pranit.kapdule@t-systems.com>
Date: Wed, 22 Feb 2023 11:41:10 +0530
Subject: [DCAEGEN2]Upgrade dependencies for dcaegen2-services-son-handler

Upgrade dependency version as per SECCOM recommendation

Issue-ID: DCAEGEN2-3356
Change-Id: Ib10d436e8031faebaac304dea2eb9e131f71957e
Signed-off-by: pranitk1905 <pranit.kapdule@t-systems.com>
---
 Changelog.md       |  3 +++
 pom.xml            | 19 ++++++++++---------
 version.properties |  5 +++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bb6311f..d4e8359 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,9 @@ 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/).
 
+## [2.2.0] - 2023/02/22
+         - [DCAEGEN2-3356]-dcaegen2-services-son-handler vulnerability updates
+
 ## [2.1.11] - 2022/11/09
          - [DCAEGEN2-3311](https://jira.onap.org/browse/DCAEGEN2-3311) - Modify ANR Payload aligned to A1 schema in SDNR
 
diff --git a/pom.xml b/pom.xml
index a022ea2..9f1720a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
  *   Copyright (C) 2019-2022 Wipro Limited.
  *   Copyright (C) 2022 Huawei Technologies Co., Ltd.
  *   Copyright (C) 2022 AT&T. All rights reserved.
+ *   Copyright (c) 2023 Deutsche Telekom AG. 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.
@@ -29,7 +30,7 @@
         <groupId>org.onap.dcaegen2.services.son-handler</groupId>
         <artifactId>son-handler</artifactId>
         <name>dcaegen2-services-son-handler</name>
-        <version>2.1.11-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
 
        <!--parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId>
                 <version>2.0.4.RELEASE</version> </parent -->
@@ -44,7 +45,7 @@
 
         <properties>
                 <sdk.version>1.8.6</sdk.version>
-                <spring.version>5.3.20</spring.version>
+                <spring.version>5.3.25</spring.version>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <maven.compiler.source>11</maven.compiler.source>
                 <maven.compiler.target>11</maven.compiler.target>
@@ -112,7 +113,7 @@
                 <dependency>
                         <groupId>io.projectreactor.netty</groupId>
                         <artifactId>reactor-netty</artifactId>
-                        <version>0.9.12.RELEASE</version>
+                        <version>1.1.0</version>
                 </dependency>
                 <!-- cbs client -->
                 <dependency>
@@ -146,12 +147,12 @@
                 <dependency>
                         <groupId>com.fasterxml.jackson.core</groupId>
                         <artifactId>jackson-core</artifactId>
-                        <version>2.13.3</version>
+                        <version>2.14.1</version>
                 </dependency>
                 <dependency>
                         <groupId>com.fasterxml.jackson.core</groupId>
                         <artifactId>jackson-databind</artifactId>
-                        <version>2.13.3</version>
+                        <version>2.14.1</version>
                 </dependency>
                 <!-- https://mvnrepository.com/artifact/javax.json/javax.json-api -->
                 <dependency>
@@ -173,7 +174,7 @@
                  <dependency>
                         <groupId>org.postgresql</groupId>
                         <artifactId>postgresql</artifactId>
-                        <version>42.3.6</version>
+                        <version>42.5.1</version>
                         </dependency>
                  <dependency>
                         <groupId>org.springframework.boot</groupId>
@@ -249,7 +250,7 @@
             <dependency>
                    <groupId>org.eclipse.jetty</groupId>
                    <artifactId>jetty-server</artifactId>
-                   <version>9.4.40.v20210413</version>
+                   <version>11.0.12</version>
             </dependency>
             <!-- https://mvnrepository.com/artifact/org.webjars/bootstrap -->
             <dependency>
@@ -272,12 +273,12 @@
             <dependency>
                     <groupId>org.apache.tomcat.embed</groupId>
                     <artifactId>tomcat-embed-core</artifactId>
-                    <version>9.0.65</version>
+                    <version>10.1.2</version>
             </dependency>
             <dependency>
                    <groupId>ch.qos.logback</groupId>
                    <artifactId>logback-core</artifactId>
-                   <version>1.2.11</version>
+                   <version>1.4.5</version>
             </dependency>
         </dependencies>
 
diff --git a/version.properties b/version.properties
index eeb484b..ce671a8 100644
--- a/version.properties
+++ b/version.properties
@@ -4,6 +4,7 @@
 #  ================================================================================
 #   Copyright (C) 2019-2022 Wipro Limited.
 #   Copyright (C) 2022 Huawei Technologies Co., Ltd.
+#   Copyright (c) 2023 Deutsche Telekom AG. 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.
@@ -20,8 +21,8 @@
 #
 ###############################################################################
 major=2
-minor=1
-patch=11
+minor=2
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg