From 206f4878d9969bd80acbea31181a504fe9737b43 Mon Sep 17 00:00:00 2001
From: tkogut <tomasz.kogut@nokia.com>
Date: Wed, 10 Feb 2021 12:10:50 +0100
Subject: Vulnerability removal for ves collector

- remove junit from runtime dependencies
- update junit to 5.7.1
- update springfox libraries to 3.0.0

Issue-ID: DCAEGEN2-2593
Signed-off-by: tkogut <tomasz.kogut@nokia.com>
Change-Id: I9ed39668474349013f8d8768abd4784afe24da52
---
 Changelog.md       |  4 +++-
 pom.xml            | 18 +++++++++++++++---
 version.properties |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5b08467b..747a0c5d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -38,5 +38,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
          - [DCAEGEN2-2462](https://jira.onap.org/browse/DCAEGEN2-2462) - Adapt schema-map.json and test files to updated 3GPP repos 
 ## [1.7.8] - 13/10/2020
           - [DCAEGEN2-2478](https://jira.onap.org/browse/DCAEGEN2-2478) - Add logs from external-repo-manager lib
- # [1.7.9] - 01/11/2020
+## [1.7.9] - 01/11/2020
          -  [DCAEGEN2-2495](https://jira.onap.org/browse/DCAEGEN2-2495) - Ves Collector is down because of java heap space
+## [1.7.10] - 10/02/2021
+         -  [DCAEGEN2-2593](https://jira.onap.org/browse/DCAEGEN2-2593) - Vulnerability removal for ves collector
diff --git a/pom.xml b/pom.xml
index 762980f2..9e6a1c02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>
   <groupId>org.onap.dcaegen2.collectors.ves</groupId>
   <artifactId>VESCollector</artifactId>
-  <version>1.7.9-SNAPSHOT</version>
+  <version>1.7.10-SNAPSHOT</version>
   <name>dcaegen2-collectors-ves</name>
   <description>VESCollector</description>
   <properties>
@@ -68,8 +68,8 @@
     <commons-configuration.version>1.10</commons-configuration.version>
     <vavr.version>0.9.2</vavr.version>
     <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>
-    <springfox-swagger2.version>2.8.0</springfox-swagger2.version>
-    <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
+    <springfox-swagger2.version>3.0.0</springfox-swagger2.version>
+    <junit-jupiter-api.version>5.7.1</junit-jupiter-api.version>
     <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
     <assertj-core.version>3.8.0</assertj-core.version>
     <jimfs.version>1.1</jimfs.version>
@@ -80,6 +80,7 @@
     <functionaljava.version>4.8.1</functionaljava.version>
     <external-schema-manager.version>1.4.3</external-schema-manager.version>
     <sdk.version>1.4.2</sdk.version>
+    <guava.version>30.1-jre</guava.version>
   </properties>
   <build>
     <pluginManagement>
@@ -306,6 +307,12 @@
       <groupId>com.googlecode.json-simple</groupId>
       <artifactId>json-simple</artifactId>
       <version>${json-simple.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.networknt</groupId>
@@ -328,6 +335,11 @@
       <artifactId>json</artifactId>
       <version>${json.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
     <!-- REST API RELATED -->
     <dependency>
       <groupId>com.att.nsa</groupId>
diff --git a/version.properties b/version.properties
index 6501a4a6..96125af9 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=7
-patch=9
+patch=10
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg