diff options
| author |   JulienBe <julien.bertozzi@intl.att.com> | 2020-06-24 17:31:27 +0200 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-06-25 05:12:02 +0000 |
| commit | 56f99ec6ce4cf9ae5a0c9bf162164aa1c05413b3 (patch) | |
| tree | 311486442cabb366898fc9a91d78a262df71023c | |
| parent | e9cb7eb287f88938b0a2f6d2cd0743e6ac2867f8 (diff) | |
Rationalize maven dependencies
Issue-ID: SDC-3149
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Change-Id: I1ee42494a4cc5b185b6dfcbee44399d2960cf880
58 files changed, 35 insertions, 531 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml index c879453fba..88a372f0df 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -13,21 +13,6 @@ </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> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -510,12 +495,6 @@ </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index cd2dd305e8..cc11b13069 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -21,21 +21,6 @@ </properties> <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> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>togglz-rest-services</artifactId> diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index b939448f2d..52a317dd74 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -34,20 +34,6 @@ Modifications copyright (c) 2018 Nokia </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> - <scope>test</scope> - </dependency> <!-- Common of SDC --> <dependency> @@ -156,12 +142,6 @@ Modifications copyright (c) 2018 Nokia </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> <scope>test</scope> @@ -427,4 +407,4 @@ Modifications copyright (c) 2018 Nokia </plugins> </pluginManagement> </build> -</project>
\ No newline at end of file +</project> diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index e861debeca..938f1f7a5c 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -13,20 +13,6 @@ </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> - <scope>test</scope> - </dependency> <dependency> <groupId>org.projectlombok</groupId> @@ -301,12 +287,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> <build> diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 5d17b745ea..599bb91516 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -14,20 +14,6 @@ </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> - <scope>test</scope> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> @@ -240,12 +226,6 @@ </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> <scope>test</scope> @@ -382,4 +362,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 33248f6cff..0c7f3eacbd 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -13,21 +13,6 @@ </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> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.sdc.sdc-be-common</groupId> <artifactId>security-util-lib</artifactId> @@ -220,12 +205,6 @@ </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.google.code.bean-matchers</groupId> <artifactId>bean-matchers</artifactId> <version>${bean-matchers.version}</version> @@ -317,4 +296,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml index 19dc8bb4d0..d3b2939166 100644 --- a/common-app-logging/pom.xml +++ b/common-app-logging/pom.xml @@ -13,20 +13,6 @@ </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> - <scope>test</scope> - </dependency> <dependency> <groupId>javax.servlet</groupId> diff --git a/common-be/pom.xml b/common-be/pom.xml index aad2d0bdb4..8d8846d184 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -13,20 +13,6 @@ </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> - <scope>test</scope> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -112,12 +98,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> <version>${tosca.datatype.version}</version> diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml index 2981a6bdc4..5ae08b85bc 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml @@ -12,28 +12,4 @@ <groupId>org.onap.sdc.common</groupId> <version>1.7.0-SNAPSHOT</version> </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> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </project> diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index 1583aa90d0..cbf68742b4 100755 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -30,20 +30,6 @@ </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> - <scope>test</scope> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml index bdfa1507c5..43cd9c4f0d 100644 --- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml +++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml @@ -13,20 +13,6 @@ <artifactId>onap-generic-artifact-browser-component-tests</artifactId> <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> - <scope>test</scope> - </dependency> <!--tested packages--> <dependency> diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml index 5056341e29..59e8ed06ed 100644 --- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml +++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml @@ -19,20 +19,6 @@ </properties> <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> - <scope>test</scope> - </dependency> <dependency> <groupId>org.projectlombok</groupId> diff --git a/common/onap-tosca-datatype/pom.xml b/common/onap-tosca-datatype/pom.xml index 91b4202b09..441e6f70e0 100644 --- a/common/onap-tosca-datatype/pom.xml +++ b/common/onap-tosca-datatype/pom.xml @@ -29,20 +29,6 @@ </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> - <scope>test</scope> - </dependency> <dependency> <groupId>org.yaml</groupId> @@ -76,11 +62,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> diff --git a/onboarding/pom.xml b/onboarding/pom.xml index fb04f8ac13..8b487407aa 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -98,7 +98,6 @@ <jersey.core.version>1.19.1</jersey.core.version> <jersey.multipart.version>1.18.1</jersey.multipart.version> <logback.version>1.2.3</logback.version> - <mockito.all.version>1.10.19</mockito.all.version> <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version> <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version> <org.reflections.version>0.9.10</org.reflections.version> @@ -298,12 +297,6 @@ <version>${testng.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${mockito.all.version}</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index 5995ce52ce..8ec79cd913 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -111,11 +111,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.sun.activation</groupId> <artifactId>javax.activation</artifactId> <version>1.2.0</version> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml index 184ed4cd76..44391d57cf 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml @@ -124,11 +124,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-externaltesting-impl</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml index 205f92502c..147f5fa628 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml @@ -58,11 +58,6 @@ <artifactId>jackson-core</artifactId> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.github.tomakehurst</groupId> <artifactId>wiremock-standalone</artifactId> <version>${wire-mock.version}</version> @@ -75,4 +70,4 @@ </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml index 8762a21021..45c9858053 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml @@ -50,12 +50,7 @@ <artifactId>spring-context</artifactId> <version>${spring.framework.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index 393e672a6b..733a719721 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -81,11 +81,6 @@ <version>${jersey-bom.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml index fb523705a5..7866d12de4 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml @@ -51,11 +51,6 @@ <version>${cxf.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc.be</groupId> <artifactId>common-be</artifactId> <version>${project.version}</version> @@ -64,4 +59,4 @@ </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml index e8605a55be..4e9fe038b5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml @@ -46,12 +46,6 @@ <artifactId>spring-context</artifactId> <version>${spring.framework.version}</version> </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> @@ -60,4 +54,4 @@ </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml index ecefd33276..2d94abffc5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml @@ -123,11 +123,6 @@ <version>${jersey.multipart.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml index 6cd5727baa..16262af6eb 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml @@ -25,11 +25,6 @@ <type>pom</type> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.framework.version}</version> diff --git a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml index 532b6f3c47..f900e3c109 100644 --- a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml @@ -76,11 +76,6 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml index 8ac36730e1..421feb415c 100644 --- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml @@ -56,11 +56,6 @@ <artifactId>openecomp-zusammen-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> @@ -80,4 +75,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml index df5c765670..e872f95829 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml @@ -76,11 +76,6 @@ <artifactId>testng</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index 9d0c33ee63..a4c9352870 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -66,14 +66,6 @@ <version>3.1.0</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> - - </dependencies> </project> diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml index 738a472f61..0fbf3cef24 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml @@ -35,11 +35,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>javax.el-api</artifactId> <version>${javax.el-api.version}</version> 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 7b23506bac..60489380dd 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 @@ -66,11 +66,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-translator-core</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml index 93052d673b..a703364a1f 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml @@ -36,15 +36,10 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groove-all.version}</version> <scope>test</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml index 69b94da566..6b13421925 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml @@ -71,12 +71,6 @@ <artifactId>lombok</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml index 8994c6f7bc..6d1233e3f7 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml @@ -43,11 +43,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-session-lib</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml index bb54a1d120..c19c10dc14 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml @@ -34,12 +34,7 @@ <artifactId>testng</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml index 7882606c00..04ffb8a658 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml @@ -67,10 +67,5 @@ <artifactId>openecomp-nosqldb-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml index 80a712ab29..1f4c243b50 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml @@ -70,11 +70,6 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index 8f6a7c19de..4349fcf04c 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -71,11 +71,6 @@ <artifactId>openecomp-sdc-validation-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 301ac6c957..f4508b711d 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -66,12 +66,6 @@ <artifactId>openecomp-sdc-notification-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml index aa2d6db01d..53694d85a8 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml @@ -23,14 +23,9 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index 0034816051..779a2d3fbc 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -61,11 +61,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-model-impl</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index 34076b7c94..32436e3466 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -61,11 +61,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-heat-lib</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml index 65f7651247..d36919d621 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml @@ -68,11 +68,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml index dbf7318fe9..03ff7b51b3 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml @@ -44,11 +44,6 @@ <artifactId>spring-webmvc</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml index 15b3a6a21c..fb960f07e2 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml @@ -35,11 +35,6 @@ <artifactId>openecomp-sdc-notification-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index d9ad10ce1a..45b212104e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -42,11 +42,6 @@ <version>${logback.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-utilities-lib</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index 4c297b2368..8798968f46 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -64,11 +64,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml index 7e2e8ad090..ee6bf0a5d1 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml @@ -63,11 +63,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-heat-lib</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml index aa6b0e64ed..f678243617 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml @@ -32,11 +32,6 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> <version>${jackson.dataformat.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml index bb8ade4af7..cded477510 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml @@ -66,11 +66,6 @@ <version>${commons.io.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml index 7243a4ab95..858b4d33f6 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml @@ -85,11 +85,6 @@ <version>${javax.el.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-logging-core</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml index da23f53e38..350ba72e5d 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml @@ -32,11 +32,6 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> <version>${jmockit.version}</version> diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml index 2397dd8d8e..b398460004 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml @@ -49,12 +49,6 @@ <version>${jmockit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> </dependencies> <parent> diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index e7cec4d6d9..88d9021e5a 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -73,11 +73,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-logging-core</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index bce4d696f2..b08ede41da 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -33,20 +33,6 @@ </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> - <scope>test</scope> - </dependency> <dependency> <groupId>com.github.testng-team</groupId> <artifactId>testng-junit5</artifactId> @@ -196,12 +196,6 @@ Modifications copyright (c) 2018-2019 Nokia </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - </dependency> - - <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> <version>${jmockit.version}</version> @@ -257,6 +251,27 @@ Modifications copyright (c) 2018-2019 Nokia <version>${jacoco.version}</version> <scope>test</scope> </dependency> + <!--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> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> </dependencies> <reporting> diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 105d3cd04e..4d1b8c4795 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -72,12 +72,6 @@ </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.typesafe</groupId> <artifactId>config</artifactId> <version>1.0.2</version> diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 299465ac23..75d91ce436 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -20,20 +20,6 @@ </properties> <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> - <scope>test</scope> - </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/utils/DmaapPublisher/pom.xml b/utils/DmaapPublisher/pom.xml index 1a8cf652c2..111f4f2adb 100644 --- a/utils/DmaapPublisher/pom.xml +++ b/utils/DmaapPublisher/pom.xml @@ -7,21 +7,6 @@ <version>1.0.0</version> <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> - <scope>test</scope> - </dependency> - <!--spock testing--> <dependency> <groupId>org.spockframework</groupId> @@ -67,13 +52,6 @@ <artifactId>snakeyaml</artifactId> <version>1.18</version> </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 1c21179e77..00e84a206d 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -24,21 +24,6 @@ </properties> <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> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> |