diff options
| author |   Baumel, Dvir (db384r) <dvir.baumel@intl.att.com> | 2020-03-23 16:21:05 +0200 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-04-16 08:50:35 +0000 |
| commit | 3e8793276f623132892331cf65c85bb91c1ab154 (patch) | |
| tree | a9366ecaf3999751d025d7052ad79c4d073bca63 /openecomp-be | |
| parent | ecdbf0720d0e8085e53650a10eb594cbe74eb7ef (diff) | |
Upgrade Junit to version 5.6
Issue-ID: SDC-2844
Change-Id: I4716bf7920f9bb79c450ebfd48e9d4fba54fdfdd
Signed-off-by: Baumel, Dvir (db384r) <dvir.baumel@intl.att.com>
Diffstat (limited to 'openecomp-be')
6 files changed, 28 insertions, 21 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml index 798846e127..7f53daec93 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml @@ -9,13 +9,6 @@ <artifactId>swagger-annotations</artifactId> <version>${swagger.version}</version> </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>5.3.1</version> - <scope>test</scope> - </dependency> - </dependencies> <parent> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml index e385c4b726..7b9692f13d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml @@ -28,12 +28,6 @@ <artifactId>openecomp-sdc-conflict-manager</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>5.3.1</version> - <scope>test</scope> - </dependency> </dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml index 952ba4fc06..1be303c7c0 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml @@ -9,12 +9,6 @@ <artifactId>openecomp-sdc-datatypes-lib</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>5.3.1</version> - <scope>test</scope> - </dependency> </dependencies> <parent> diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index f8c548b077..0857e1d4ff 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -232,6 +232,20 @@ <type>test-jar</type> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>${junitJupiter.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <version>${mockitoJupiter.version}</version> + <scope>test</scope> + </dependency> </dependencies> <properties> diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java index 7d59215847..07909281d9 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java @@ -19,9 +19,9 @@ */ package org.openecomp.sdc.vendorsoftwareproduct; -import static org.junit.Assert.assertNotNull; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.Assert.assertNotNull; public class ComponentManagerFactoryTest { diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index 7c99ba52c6..79bef95f81 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -55,6 +55,18 @@ <version>${togglz.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>${junitJupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <version>${mockitoJupiter.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> |