Fix sonar reporting problem

Issue-ID: DCAEGEN2-2593
Signed-off-by: tkogut <tomasz.kogut@nokia.com>
Change-Id: Iea88edb42ce87b9074d60520f4c7223f9cc9167e

diff --git a/Changelog.md b/Changelog.md
index 747a0c5..c794653 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -42,3 +42,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
          -  [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
+## [1.7.11] - 18/02/2021
+         -  [DCAEGEN2-2593](https://jira.onap.org/browse/DCAEGEN2-2593) - Vulnerability removal for ves collector
+            Fix sonar reporting problem

diff --git a/pom.xml b/pom.xml
index 9e6a1c0..51e05f6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>\r
   <groupId>org.onap.dcaegen2.collectors.ves</groupId>\r
   <artifactId>VESCollector</artifactId>\r
-  <version>1.7.10-SNAPSHOT</version>\r
+  <version>1.7.11-SNAPSHOT</version>\r
   <name>dcaegen2-collectors-ves</name>\r
   <description>VESCollector</description>\r
   <properties>\r
@@ -69,13 +69,13 @@
     <vavr.version>0.9.2</vavr.version>\r
     <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>\r
     <springfox-swagger2.version>3.0.0</springfox-swagger2.version>\r
-    <junit-jupiter-api.version>5.7.1</junit-jupiter-api.version>\r
+    <junit.jupiter.version>5.7.1</junit.jupiter.version>\r
     <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>\r
     <assertj-core.version>3.8.0</assertj-core.version>\r
     <jimfs.version>1.1</jimfs.version>\r
     <wiremock-standalone.version>2.17.0</wiremock-standalone.version>\r
     <spring-security-test.version>5.1.1.RELEASE</spring-security-test.version>\r
-    <spring-boot-starter-test.version>2.1.0.RELEASE</spring-boot-starter-test.version>\r
+    <spring-boot-starter-test.version>2.2.13.RELEASE</spring-boot-starter-test.version>\r
     <api-custom-header.version>1.1.4</api-custom-header.version>\r
     <functionaljava.version>4.8.1</functionaljava.version>\r
     <external-schema-manager.version>1.4.3</external-schema-manager.version>\r
@@ -396,20 +396,8 @@
     <!-- TESTING -->\r
     <dependency>\r
       <groupId>org.junit.jupiter</groupId>\r
-      <artifactId>junit-jupiter-api</artifactId>\r
-      <version>${junit-jupiter-api.version}</version>\r
-      <scope>test</scope>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.junit.jupiter</groupId>\r
-      <artifactId>junit-jupiter-engine</artifactId>\r
-      <version>${junit-jupiter-api.version}</version>\r
-      <scope>test</scope>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.junit.vintage</groupId>\r
-      <artifactId>junit-vintage-engine</artifactId>\r
-      <version>${junit-jupiter-api.version}</version>\r
+      <artifactId>junit-jupiter</artifactId>\r
+      <version>${junit.jupiter.version}</version>\r
       <scope>test</scope>\r
     </dependency>\r
     <dependency>\r

diff --git a/version.properties b/version.properties
index 96125af..f4fea6d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=7
-patch=10
+patch=11
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT