From a36531c38fe1a9234b8dbeaed5505cf3ca48de26 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Wed, 29 Apr 2020 18:39:35 +0100
Subject: Prepare for Junit5

Remove unused/duplicated dependencies

Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2844
Issue-ID: SDC-2983
---
 pom.xml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 846b93ad94..fad19f74f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@ Modifications copyright (c) 2018-2019 Nokia
 ================================================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.openecomp.sdc</groupId>
@@ -106,18 +106,20 @@ Modifications copyright (c) 2018-2019 Nokia
     <commons-jci-core.version>1.1</commons-jci-core.version>
 
     <!--TESTING-->
-    <mockito.version>2.18.3</mockito.version>
+    <powermock.version>2.0.7</powermock.version>
+    <mockito.version>3.3.3</mockito.version>
     <mockitoJupiter.version>3.3.3</mockitoJupiter.version>
-    <jmockit.version>1.33</jmockit.version>
+    <jmockit.version>1.35</jmockit.version>
     <junit.version>4.12</junit.version>
+    <junit.platform.version>1.6.0</junit.platform.version>
     <junitJupiter.version>5.6.0</junitJupiter.version>
     <assertj.version>3.10.0</assertj.version>
     <testng.version>6.14.3</testng.version>
-    <cucumber.version>2.4.0</cucumber.version>
+    <cucumber.version>5.6.0</cucumber.version>
     <bean-matchers.version>0.11</bean-matchers.version>
     <hamcrest.version>2.1</hamcrest.version>
     <hamcrest-all.version>1.3</hamcrest-all.version>
-    <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
 
     <!-- parser-->
@@ -126,8 +128,10 @@ Modifications copyright (c) 2018-2019 Nokia
     <!-- sonar -->
     <sonar.projectVersion>${project.version}</sonar.projectVersion>
     <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable>
-    <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-    <sonar.javascript.lcov.reportPaths>${project.build.directory}/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+    <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports
+    </sonar.surefire.reportsPath>
+    <sonar.javascript.lcov.reportPaths>${project.build.directory}/code-coverage/lcov.info
+    </sonar.javascript.lcov.reportPaths>
     <sonar.coverage.jacoco.xmlReportPaths>
       ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
@@ -357,6 +361,11 @@ Modifications copyright (c) 2018-2019 Nokia
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${maven-surefire-plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${maven-surefire-plugin.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -456,12 +465,12 @@ Modifications copyright (c) 2018-2019 Nokia
             <configuration>
               <source>
                 pom.properties['deploy.url'] =
-                        pom.version.contains('-SNAPSHOT') ?
-                                project.distributionManagement.snapshotRepository.url :
-                                project.distributionManagement.repository.url;
+                pom.version.contains('-SNAPSHOT') ?
+                project.distributionManagement.snapshotRepository.url :
+                project.distributionManagement.repository.url;
                 pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
-                        project.distributionManagement.snapshotRepository.id :
-                        project.distributionManagement.repository.id;
+                project.distributionManagement.snapshotRepository.id :
+                project.distributionManagement.repository.id;
               </source>
             </configuration>
           </execution>
-- 
cgit 1.2.3-korg