From 56f99ec6ce4cf9ae5a0c9bf162164aa1c05413b3 Mon Sep 17 00:00:00 2001 From: JulienBe Date: Wed, 24 Jun 2020 17:31:27 +0200 Subject: [PATCH] Rationalize maven dependencies Issue-ID: SDC-3149 Signed-off-by: JulienBe Change-Id: I1ee42494a4cc5b185b6dfcbee44399d2960cf880 --- asdctool/pom.xml | 21 ----------------- catalog-be/pom.xml | 15 ------------ catalog-dao/pom.xml | 22 +----------------- catalog-fe/pom.xml | 20 ---------------- catalog-model/pom.xml | 22 +----------------- common-app-api/pom.xml | 23 +----------------- common-app-logging/pom.xml | 14 ----------- common-be/pom.xml | 20 ---------------- .../onap-configuration-management-api/pom.xml | 24 ------------------- .../onap-configuration-management-core/pom.xml | 14 ----------- .../pom.xml | 14 ----------- .../onap-generic-artifact-browser-service/pom.xml | 14 ----------- common/onap-tosca-datatype/pom.xml | 19 --------------- onboarding/pom.xml | 7 ------ .../action-library-rest-services/pom.xml | 5 ---- .../externaltesting-rest-services/pom.xml | 5 ---- .../item-rest/item-rest-services/pom.xml | 7 +----- .../notifications-rest-services/pom.xml | 7 +----- .../openecomp-sdc-common-rest/pom.xml | 5 ---- .../togglz-rest/togglz-rest-services/pom.xml | 7 +----- .../unique-type-rest-services/pom.xml | 8 +------ .../validation-rest-services/pom.xml | 5 ---- .../vendor-software-products-rest-services/pom.xml | 5 ---- .../backend/openecomp-sdc-action-manager/pom.xml | 5 ---- .../openecomp-sdc-healthcheck-manager/pom.xml | 7 +----- .../openecomp-sdc-item-permissions-manager/pom.xml | 7 +----- .../backend/openecomp-sdc-security-util/pom.xml | 8 ------- .../openecomp-sdc-vendor-license-manager/pom.xml | 5 ---- .../pom.xml | 5 ---- .../openecomp-conflict-core/pom.xml | 7 +----- .../openecomp-nosqldb-api/pom.xml | 6 ----- .../openecomp-nosqldb-core/pom.xml | 5 ---- .../openecomp-session-lib/pom.xml | 7 +----- .../openecomp-zusammen-core/pom.xml | 5 ---- .../openecomp-sdc-healing-impl/pom.xml | 5 ---- openecomp-be/lib/openecomp-heat-lib/pom.xml | 5 ---- .../openecomp-item-permissions-core/pom.xml | 8 +------ .../openecomp-item-permissions-impl/pom.xml | 7 +----- .../openecomp-sdc-enrichment-core/pom.xml | 5 ---- .../openecomp-sdc-enrichment-impl/pom.xml | 5 ---- .../openecomp-sdc-externaltesting-impl/pom.xml | 5 ---- .../openecomp-sdc-logging-spring/pom.xml | 7 +----- .../openecomp-sdc-notification-core/pom.xml | 5 ---- .../openecomp-sdc-translator-core/pom.xml | 5 ---- .../openecomp-sdc-validation-core/pom.xml | 5 ---- .../openecomp-sdc-validation-impl/pom.xml | 5 ---- .../openecomp-sdc-vendor-license-core/pom.xml | 5 ---- .../pom.xml | 5 ---- .../openecomp-sdc-versioning-api/pom.xml | 5 ---- .../openecomp-sdc-versioning-core/pom.xml | 5 ---- .../openecomp-tosca-converter-core/pom.xml | 6 ----- openecomp-be/lib/openecomp-tosca-lib/pom.xml | 5 ---- openecomp-be/pom.xml | 14 ----------- pom.xml | 27 +++++++++++++++++----- test-apis-ci/pom.xml | 6 ----- ui-ci/pom.xml | 14 ----------- utils/DmaapPublisher/pom.xml | 22 ------------------ utils/webseal-simulator/pom.xml | 15 ------------ 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - - com.google.guava guava @@ -509,12 +494,6 @@ test - - org.mockito - mockito-core - test - - org.assertj assertj-core 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - - org.openecomp.sdc togglz-rest-services 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 - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - @@ -155,12 +141,6 @@ Modifications copyright (c) 2018 Nokia ${regex.version} - - org.mockito - mockito-core - test - - org.jmockit jmockit @@ -427,4 +407,4 @@ Modifications copyright (c) 2018 Nokia - \ No newline at end of file + 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - org.projectlombok @@ -301,12 +287,6 @@ test - - org.mockito - mockito-core - test - - 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - com.fasterxml.jackson.core jackson-core @@ -239,12 +225,6 @@ test - - org.mockito - mockito-core - test - - org.jmockit jmockit @@ -382,4 +362,4 @@ - \ No newline at end of file + 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - - org.onap.sdc.sdc-be-common security-util-lib @@ -219,12 +204,6 @@ test - - org.mockito - mockito-core - test - - com.google.code.bean-matchers bean-matchers @@ -317,4 +296,4 @@ - \ No newline at end of file + 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - javax.servlet 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - com.fasterxml.jackson.core @@ -111,12 +97,6 @@ ${mockitoJupiter.version} test - - org.mockito - mockito-core - ${mockito.version} - test - org.onap.sdc.common onap-tosca-datatype 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 @@ org.onap.sdc.common 1.7.0-SNAPSHOT - - - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - - - - org.mockito - mockito-core - test - - - 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - com.fasterxml.jackson.core 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 @@ onap-generic-artifact-browser-component-tests - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - org.projectlombok 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - org.yaml @@ -75,11 +61,6 @@ - - org.mockito - mockito-core - test - com.google.guava guava 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 @@ 1.19.1 1.18.1 1.2.3 - 1.10.19 1.9.13 1.5.1 0.9.10 @@ -298,12 +297,6 @@ ${testng.version} test - - org.mockito - mockito-all - ${mockito.all.version} - test - 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 @@ -110,11 +110,6 @@ ${servlet-api.version} provided - - org.mockito - mockito-core - test - com.sun.activation javax.activation 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 @@ -123,11 +123,6 @@ openecomp-sdc-common-rest ${project.version} - - org.mockito - mockito-core - test - org.openecomp.sdc openecomp-sdc-externaltesting-impl 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 @@ -57,11 +57,6 @@ com.fasterxml.jackson.core jackson-core - - org.mockito - mockito-core - test - com.github.tomakehurst wiremock-standalone @@ -75,4 +70,4 @@ - \ No newline at end of file + 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 @@ spring-context ${spring.framework.version} - - org.mockito - mockito-core - test - - \ No newline at end of file + 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 @@ ${jersey-bom.version} test - - org.mockito - mockito-core - test - 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 @@ -50,11 +50,6 @@ cxf-rt-frontend-jaxrs ${cxf.version} - - org.mockito - mockito-core - test - org.openecomp.sdc.be common-be @@ -64,4 +59,4 @@ - \ No newline at end of file + 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 @@ spring-context ${spring.framework.version} - - - org.mockito - mockito-core - test - org.glassfish.jersey.core jersey-common @@ -60,4 +54,4 @@ - \ No newline at end of file + 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 @@ ${jersey.multipart.version} provided - - org.mockito - mockito-core - test - 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 @@ -24,11 +24,6 @@ 2.3.0 pom - - org.mockito - mockito-core - test - org.springframework spring-core 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 @@ ${project.version} runtime - - org.mockito - mockito-core - test - 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 @@ openecomp-zusammen-core ${project.version} - - org.mockito - mockito-core - test - @@ -80,4 +75,4 @@ - \ No newline at end of file + 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 @@ testng test - - org.mockito - mockito-core - test - - \ No newline at end of file + 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 @@ 3.1.0 - - org.mockito - mockito-core - ${mockito.version} - test - - - 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 @@ -34,11 +34,6 @@ openecomp-sdc-vendor-license-core ${project.version} - - org.mockito - mockito-core - test - javax.el javax.el-api 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 @@ -65,11 +65,6 @@ openecomp-tosca-lib ${project.version} - - org.mockito - mockito-core - test - org.openecomp.sdc openecomp-sdc-translator-core 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 @@ -35,11 +35,6 @@ openecomp-sdc-vendor-license-core ${project.version} - - org.mockito - mockito-core - test - org.codehaus.groovy groovy-all @@ -47,4 +42,4 @@ test - \ No newline at end of file + 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 @@ lombok provided - - org.mockito - mockito-core - ${mockito.version} - test - 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 @@ -42,11 +42,6 @@ openecomp-nosqldb-api ${project.version} - - org.mockito - mockito-core - test - org.openecomp.sdc.core openecomp-session-lib 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 @@ testng test - - org.mockito - mockito-core - test - - \ No newline at end of file + 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 @@ openecomp-nosqldb-core ${project.version} - - org.mockito - mockito-core - test - 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 @@ ${project.version} runtime - - org.mockito - mockito-core - test - 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 @@ openecomp-sdc-validation-api ${project.version} - - org.mockito - mockito-core - test - 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 @@ openecomp-sdc-notification-api ${project.version} - - org.mockito - mockito-core - test - - - \ No newline at end of file + 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 @@ -22,15 +22,10 @@ ${project.version} runtime - - org.mockito - mockito-core - test - org.testng testng test - \ No newline at end of file + 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 @@ -60,11 +60,6 @@ openecomp-sdc-datatypes-lib ${project.version} - - org.mockito - mockito-core - test - org.openecomp.sdc openecomp-sdc-model-impl 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 @@ -60,11 +60,6 @@ openecomp-common-lib ${project.version} - - org.mockito - mockito-core - test - org.openecomp.sdc.core openecomp-heat-lib 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 @@ -67,11 +67,6 @@ openecomp-heat-lib ${project.version} - - org.mockito - mockito-core - test - commons-io commons-io 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 @@ spring-webmvc provided - - org.mockito - mockito-core - test - - \ No newline at end of file + 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 @@ openecomp-sdc-notification-api ${project.version} - - org.mockito - mockito-core - test - 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 @@ -41,11 +41,6 @@ logback-classic ${logback.version} - - org.mockito - mockito-core - test - org.openecomp.sdc.core openecomp-utilities-lib 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 @@ -63,11 +63,6 @@ openecomp-sdc-datatypes-lib ${project.version} - - org.mockito - mockito-core - test - org.onap.sdc.common onap-configuration-management-core 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 @@ -62,11 +62,6 @@ openecomp-common-lib ${project.version} - - org.mockito - mockito-core - test - org.openecomp.sdc.core openecomp-heat-lib 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 @@ -31,11 +31,6 @@ ${project.version} runtime - - org.mockito - mockito-core - test - com.fasterxml.jackson.dataformat jackson-dataformat-xml 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 @@ -65,11 +65,6 @@ commons-io ${commons.io.version} - - org.mockito - mockito-core - test - org.onap.sdc.common onap-configuration-management-core 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 @@ -84,11 +84,6 @@ javax.el ${javax.el.version} - - org.mockito - mockito-core - test - org.openecomp.sdc openecomp-sdc-logging-core 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 @@ -31,11 +31,6 @@ ${project.version} runtime - - org.mockito - mockito-core - test - org.jmockit jmockit 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 @@ ${jmockit.version} test - - org.mockito - mockito-core - ${mockito.version} - test - 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 @@ -72,11 +72,6 @@ ${hamcrest.version} test - - org.mockito - mockito-core - test - org.openecomp.sdc openecomp-sdc-logging-core 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - com.github.testng-team testng-junit5 diff --git a/pom.xml b/pom.xml index c571cdec98..fb28bbcec5 100644 --- a/pom.xml +++ b/pom.xml @@ -195,12 +195,6 @@ Modifications copyright (c) 2018-2019 Nokia ${assertj.version} - - org.mockito - mockito-core - ${mockito.version} - - org.jmockit jmockit @@ -257,6 +251,27 @@ Modifications copyright (c) 2018-2019 Nokia ${jacoco.version} test + + + org.junit.jupiter + junit-jupiter-engine + ${junitJupiter.version} + test + + + + org.junit.vintage + junit-vintage-engine + ${junitJupiter.version} + test + + + + org.mockito + mockito-core + ${mockito.version} + test + 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 @@ -71,12 +71,6 @@ compile - - org.mockito - mockito-core - test - - com.typesafe config 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - com.google.guava 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 @@ 1.0.0 - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - - org.spockframework @@ -67,13 +52,6 @@ snakeyaml 1.18 - - - org.mockito - mockito-core - ${mockito.version} - test - org.assertj assertj-core 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 @@ - - - org.junit.jupiter - junit-jupiter-engine - ${junitJupiter.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junitJupiter.version} - test - - javax.servlet servlet-api -- 2.16.6