From c21ca66f190f76feb5800ee500ff87ff7e67f5c5 Mon Sep 17 00:00:00 2001
From: Jithendra <veeravalli.kumar@wipro.com>
Date: Sat, 27 Aug 2022 12:17:03 +0000
Subject: slice-analysis-ms vulnerability updates

Issue-ID: DCAEGEN2-3221
Signed-off-by: Jithendra <veeravalli.kumar@wipro.com>
Change-Id: If53a9432f812c2c3976c37185e804dc565ab0355
---
 components/slice-analysis-ms/ChangeLog.md                    |  2 ++
 components/slice-analysis-ms/pom.xml                         | 12 ++++++------
 .../slice/analysis/ms/service/MLMessageProcessorTest.java    |  8 ++------
 components/slice-analysis-ms/version.properties              |  3 ++-
 4 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'components/slice-analysis-ms')

diff --git a/components/slice-analysis-ms/ChangeLog.md b/components/slice-analysis-ms/ChangeLog.md
index 56655a68..52ca9f7d 100644
--- a/components/slice-analysis-ms/ChangeLog.md
+++ b/components/slice-analysis-ms/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.1.5] - 2022/08/27
+         - [DCAEGEN2-3221](https://jira.onap.org/browse/DCAEGEN2-3221) - Slice-Analysis-Ms vulnerability updates
 
 ## [1.1.4] - 2022/07/28
          - [DCAEGEN2-3120](https://jira.onap.org/browse/DCAEGEN2-3120) - Enhance sliceanalysis MS to use DCAE SDK dmaap-client lib
diff --git a/components/slice-analysis-ms/pom.xml b/components/slice-analysis-ms/pom.xml
index f72f8d83..3b2cfcd7 100644
--- a/components/slice-analysis-ms/pom.xml
+++ b/components/slice-analysis-ms/pom.xml
@@ -35,14 +35,14 @@
         </parent>
         <groupId>org.onap.dcaegen2.services.components</groupId>
         <artifactId>slice-analysis-ms</artifactId>
-        <version>1.1.4-SNAPSHOT</version>
+        <version>1.1.5-SNAPSHOT</version>
         <name>dcaegen2-services-slice-analysis-ms</name>
         <description>Network slice PM analyser</description>
         <packaging>jar</packaging>
         <properties>
                 <java.version>11</java.version>
                 <sdk.version>1.8.7</sdk.version>
-                <spring.version>5.3.14</spring.version>
+                <spring.version>5.3.20</spring.version>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <maven.compiler.source>11</maven.compiler.source>
                 <maven.compiler.target>11</maven.compiler.target>
@@ -182,7 +182,7 @@
                 <dependency>
                         <groupId>com.fasterxml.jackson.core</groupId>
                         <artifactId>jackson-core</artifactId>
-                        <version>2.12.6</version>
+                        <version>2.13.3</version>
                 </dependency>
                 <dependency>
                         <groupId>net.javacrumbs.json-unit</groupId>
@@ -193,7 +193,7 @@
                 <dependency>
                         <groupId>com.fasterxml.jackson.core</groupId>
                         <artifactId>jackson-databind</artifactId>
-                        <version>2.12.6</version>
+                        <version>2.13.3</version>
                 </dependency>
                 <!-- https://mvnrepository.com/artifact/javax.json/javax.json-api -->
                 <dependency>
@@ -215,7 +215,7 @@
                 <dependency>
                         <groupId>org.postgresql</groupId>
                         <artifactId>postgresql</artifactId>
-                        <version>42.2.13</version>
+                        <version>42.3.6</version>
                 </dependency>
                 <dependency>
                         <groupId>org.springframework.boot</groupId>
@@ -316,7 +316,7 @@
                 <dependency>
                         <groupId>org.apache.tomcat.embed</groupId>
                         <artifactId>tomcat-embed-core</artifactId>
-                        <version>9.0.50</version>
+                        <version>10.0.21</version>
                 </dependency>
                 <!-- https://mvnrepository.com/artifact/nl.jqno.equalsverifier/equalsverifier -->
                 <dependency>
diff --git a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/MLMessageProcessorTest.java b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/MLMessageProcessorTest.java
index 708ba7e4..7223ecdd 100644
--- a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/MLMessageProcessorTest.java
+++ b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/MLMessageProcessorTest.java
@@ -88,12 +88,8 @@ public class MLMessageProcessorTest {
         ricToCellMapping.put("13", myList);
 
         try {
-            mloutput =
-                    obj.readValue(new String(Files.readAllBytes(Paths.get("src/test/resources/MLOutputModel1.json"))),
-                            new TypeReference<MLOutputModel>() {});
-            mloutputExp =
-                    obj.readValue(new String(Files.readAllBytes(Paths.get("src/test/resources/MLOutputModel.json"))),
-                            new TypeReference<MLOutputModel>() {});
+            mloutput = obj.readValue(new String(Files.readAllBytes(Paths.get("src/test/resources/MLOutputModel.json"))),new TypeReference<MLOutputModel>() {});
+            mloutputExp = obj.readValue(new String(Files.readAllBytes(Paths.get("src/test/resources/MLOutputModel.json"))),new TypeReference<MLOutputModel>() {});
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/components/slice-analysis-ms/version.properties b/components/slice-analysis-ms/version.properties
index b536cee6..672d9b5f 100644
--- a/components/slice-analysis-ms/version.properties
+++ b/components/slice-analysis-ms/version.properties
@@ -5,6 +5,7 @@
 #   Copyright (C) 2020-2021 Wipro Limited.
 #   Copyright (C) 2022 Huawei Canada Limited.
 #   Copyright (C) 2022 CTC, Inc.
+#   Copyright (c) 2022 Wipro Limited.
 #   ==============================================================================
 #     Licensed under the Apache License, Version 2.0 (the "License");
 #     you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@
 ###############################################################################
 major=1
 minor=1
-patch=4
+patch=5
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg