[DCAEGEN2] Upgrade dependencies for dcaegen2-services-kpi-computation-ms

Upgrade dependency version as per SECCOM recommendations

Issue-ID: DCAEGEN2-3354
Change-Id: Id0d56d0c141315178e97ccc8289613b6ff67de98
Signed-off-by: sushant53 <sushant.jadhav@t-systems.com>

diff --git a/components/kpi-computation-ms/Changelog.md b/components/kpi-computation-ms/Changelog.md
index 3031990..57c0611 100644 (file)
--- a/components/kpi-computation-ms/Changelog.md
+++ b/components/kpi-computation-ms/Changelog.md
@@ -5,6 +5,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.2.0]
+### Changed
+* KPI MS - Vulnerability updates (DCAEGEN2-3354)
+
 ## [1.0.11]
 ### Changed
 * Fix bug in wrong SNSSAI value being appended with MeasType string (DCAEGEN2-3310)

diff --git a/components/kpi-computation-ms/pom.xml b/components/kpi-computation-ms/pom.xml
index e60d12a..63070a6 100644 (file)
--- a/components/kpi-computation-ms/pom.xml
+++ b/components/kpi-computation-ms/pom.xml
@@ -3,6 +3,7 @@
   ~ ============LICENSE_START=======================================================
   ~ Copyright (c) 2021 China Mobile. All rights reserved.
   ~ Copyright (c) 2021-2022 Wipro Limited.
+  ~ 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.components</groupId>
     <artifactId>kpi-ms</artifactId>
-    <version>1.0.11-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <name>dcaegen2-services-kpi-computation-ms</name>
     <description>Kpi ms</description>
     <packaging>jar</packaging>
@@ -51,11 +52,11 @@
             ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <lombok.version>1.18.4</lombok.version>
-        <undertow.version>2.2.17.Final</undertow.version>
+        <undertow.version>2.3.0.Final</undertow.version>
         <xml.version>2.3.1</xml.version>
         <jaxb.version>2.3.0.1</jaxb.version>
         <docker.repository>nexus3.onap.org:10003</docker.repository>
-        <spring.version>5.3.20</spring.version>
+        <spring.version>5.3.25</spring.version>
         <junit.version>5.3.2</junit.version>
         <mockito.version>2.23.4</mockito.version>
         <mockito-ju5-ext.version>2.23.4</mockito-ju5-ext.version>
@@ -131,7 +132,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.3</version>
+            <version>2.14.1</version>
         </dependency>
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
@@ -142,7 +143,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.14.1</version>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>
@@ -173,7 +174,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.4.41.v20210516</version>
+            <version>11.0.12</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -295,7 +296,7 @@
         <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/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/DmaapClient.java b/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/DmaapClient.java
index 44b6535..4d48d97 100644 (file)
--- a/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/DmaapClient.java
+++ b/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/DmaapClient.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2021 China Mobile.
  *  Copyright (C) 2022 Wipro Limited.
+ *  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.
@@ -28,7 +29,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.onap.dcaegen2.kpi.models.Configuration;
 import org.onap.dcaegen2.kpi.utils.DmaapUtils;

diff --git a/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/NewPmNotification.java b/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/NewPmNotification.java
index fcd5e25..4102d60 100644 (file)
--- a/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/NewPmNotification.java
+++ b/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/dmaap/NewPmNotification.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2021 China Mobile.
+ *  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,7 +21,7 @@
 
 package org.onap.dcaegen2.kpi.dmaap;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.stereotype.Component;
 

diff --git a/components/kpi-computation-ms/version.properties b/components/kpi-computation-ms/version.properties
index 0018358..499327c 100644 (file)
--- a/components/kpi-computation-ms/version.properties
+++ b/components/kpi-computation-ms/version.properties
@@ -4,6 +4,7 @@
 #  ================================================================================
 #   Copyright (C) 2021 China Mobile.
 #   Copyright (C) 2022 Wipro Limited. 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.
@@ -20,8 +21,8 @@
 #
 ###############################################################################
 major=1
-minor=0
-patch=11
+minor=2
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT