From cc5dd607db88c4fd5a49062853c1ef9e58f038b0 Mon Sep 17 00:00:00 2001 From: sushant53 Date: Wed, 22 Feb 2023 14:35:48 +0530 Subject: [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 --- components/kpi-computation-ms/Changelog.md | 4 ++++ components/kpi-computation-ms/pom.xml | 15 ++++++++------- .../java/org/onap/dcaegen2/kpi/dmaap/DmaapClient.java | 3 ++- .../org/onap/dcaegen2/kpi/dmaap/NewPmNotification.java | 3 ++- components/kpi-computation-ms/version.properties | 5 +++-- 5 files changed, 19 insertions(+), 11 deletions(-) (limited to 'components') diff --git a/components/kpi-computation-ms/Changelog.md b/components/kpi-computation-ms/Changelog.md index 30319907..57c0611b 100644 --- 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 e60d12a0..63070a63 100644 --- 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 @@ org.onap.dcaegen2.services.components kpi-ms - 1.0.11-SNAPSHOT + 1.2.0-SNAPSHOT dcaegen2-services-kpi-computation-ms Kpi ms jar @@ -51,11 +52,11 @@ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml 1.18.4 - 2.2.17.Final + 2.3.0.Final 2.3.1 2.3.0.1 nexus3.onap.org:10003 - 5.3.20 + 5.3.25 5.3.2 2.23.4 2.23.4 @@ -131,7 +132,7 @@ com.fasterxml.jackson.core jackson-core - 2.13.3 + 2.14.1 net.javacrumbs.json-unit @@ -142,7 +143,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.3 + 2.14.1 javax.json @@ -173,7 +174,7 @@ org.eclipse.jetty jetty-server - 9.4.41.v20210516 + 11.0.12 javax.xml.bind @@ -295,7 +296,7 @@ ch.qos.logback logback-core - 1.2.11 + 1.4.5 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 44b6535b..4d48d975 100644 --- 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 fcd5e259..4102d60a 100644 --- 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 00183588..499327c8 100644 --- 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 -- cgit 1.2.3-korg