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
---
 common-be/pom.xml | 75 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 33 deletions(-)

(limited to 'common-be')

diff --git a/common-be/pom.xml b/common-be/pom.xml
index 1b3b8e1a7d..672d0a211b 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -1,5 +1,6 @@
-<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">
+<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">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.openecomp.sdc.be</groupId>
@@ -12,6 +13,20 @@
   </parent>
 
   <dependencies>
+    <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junitJupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API  -->
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>${junitJupiter.version}</version>
+    </dependency>
+
     <!-- Common of SD&C -->
     <dependency>
       <groupId>org.openecomp.sdc</groupId>
@@ -66,12 +81,6 @@
       <version>${hamcrest.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
@@ -112,34 +121,34 @@
       <scope>test</scope>
     </dependency>
 
-        <!-- Togglz core module (mandatory) -->
-        <dependency>
-            <groupId>org.togglz</groupId>
-            <artifactId>togglz-core</artifactId>
-            <version>${togglz.version}</version>
-        </dependency>
+    <!-- Togglz core module (mandatory) -->
+    <dependency>
+      <groupId>org.togglz</groupId>
+      <artifactId>togglz-core</artifactId>
+      <version>${togglz.version}</version>
+    </dependency>
 
-        <!-- Togglz for Servlet environments (mandatory for webapps) -->
-        <dependency>
-            <groupId>org.togglz</groupId>
-            <artifactId>togglz-servlet</artifactId>
-            <version>${togglz.version}</version>
-        </dependency>
+    <!-- Togglz for Servlet environments (mandatory for webapps) -->
+    <dependency>
+      <groupId>org.togglz</groupId>
+      <artifactId>togglz-servlet</artifactId>
+      <version>${togglz.version}</version>
+    </dependency>
 
-        <!-- Togglz Admin Console -->
-        <dependency>
-            <groupId>org.togglz</groupId>
-            <artifactId>togglz-console</artifactId>
-            <version>${togglz.version}</version>
-        </dependency>
+    <!-- Togglz Admin Console -->
+    <dependency>
+      <groupId>org.togglz</groupId>
+      <artifactId>togglz-console</artifactId>
+      <version>${togglz.version}</version>
+    </dependency>
 
-        <!-- Togglz for testing -->
-        <dependency>
-            <groupId>org.togglz</groupId>
-            <artifactId>togglz-testing</artifactId>
-            <version>${togglz.version}</version>
-            <scope>test</scope>
-        </dependency>
+    <!-- Togglz for testing -->
+    <dependency>
+      <groupId>org.togglz</groupId>
+      <artifactId>togglz-testing</artifactId>
+      <version>${togglz.version}</version>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
   <build>
-- 
cgit 1.2.3-korg