From cc02160dfa3a7a201b79fe11ceaa51e431be7341 Mon Sep 17 00:00:00 2001 From: bobbymander Date: Wed, 28 Mar 2018 15:05:33 -0400 Subject: POM changes to centralize test scope deps Issue-ID: POLICY-600 Change-Id: I870317bbd125c6016818ec435ea7a406123c66c1 Signed-off-by: bobbymander --- BRMSGateway/pom.xml | 19 -------------- LogParser/pom.xml | 47 ---------------------------------- ONAP-PAP-REST/pom.xml | 40 ----------------------------- ONAP-PDP-REST/pom.xml | 40 ----------------------------- ONAP-PDP/pom.xml | 31 ---------------------- ONAP-REST/pom.xml | 36 -------------------------- ONAP-SDK-APP/pom.xml | 6 ----- ONAP-XACML/pom.xml | 45 +------------------------------- POLICY-SDK-APP/pom.xml | 6 ----- PolicyEngineAPI/pom.xml | 34 ------------------------- PolicyEngineUtils/pom.xml | 16 ------------ packages/pom.xml | 10 +------- pom.xml | 65 +++++++++++++++++++++++++++++++++-------------- 13 files changed, 48 insertions(+), 347 deletions(-) diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 76cbc1b6a..18ed8f7b8 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -45,12 +45,6 @@ - - junit - junit - 4.11 - test - org.apache.maven maven-model @@ -123,19 +117,6 @@ httpclient ${httpclient.version} - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - - org.powermock - powermock-module-junit4 - 1.7.3 - test - diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 7ef977c94..11f84d6cb 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -22,14 +22,12 @@ 4.0.0 - org.onap.policy.engine PolicyEngineSuite 1.2.0-SNAPSHOT LogParser - com.h2database @@ -44,27 +42,11 @@ org.onap.policy.common ONAP-Logging ${project.version} - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - org.onap.policy.common integrity-monitor ${project.version} - - - org.powermock - powermock-api-mockito - - org.apache.logging.log4j @@ -86,23 +68,6 @@ eclipselink 2.6.0 - - junit - junit - 4.11 - test - - - org.mockito - mockito-core - 2.7.22 - - - - org.mockito - mockito-all - 1.10.19 - org.onap.policy.engine PolicyEngineUtils @@ -130,18 +95,6 @@ - - org.powermock - powermock-module-junit4 - 1.7.3 - test - - - org.powermock - powermock-api-mockito2 - 1.7.3 - test - diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 65a544b0f..de3737837 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -21,7 +21,6 @@ - 4.0.0 ONAP-PAP-REST ONAP-PAP-REST @@ -109,16 +108,6 @@ org.onap.policy.common ONAP-Logging ${project.version} - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - javax.servlet @@ -176,12 +165,6 @@ org.eclipse.jgit 3.2.0.201312181205-r - - junit - junit - 4.11 - test - org.apache.tomcat tomcat-jdbc @@ -211,21 +194,11 @@ mariadb-java-client 2.1.1 - - org.springframework - spring-mock - 2.0.8 - org.onap.policy.drools-applications.controlloop.common policy-yaml ${project.version} - - com.mockrunner - mockrunner - 0.3.1 - org.springframework @@ -331,19 +304,6 @@ tomcat-dbcp 8.5.9 - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - - org.powermock - powermock-module-junit4 - 1.7.3 - test - 4.3.3.RELEASE diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index f800a8f31..571d4b783 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -20,17 +20,13 @@ --> - 4.0.0 - org.onap.policy.engine PolicyEngineSuite 1.2.0-SNAPSHOT - ONAP-PDP-REST - ONAP PDP REST 4.3.3.RELEASE @@ -48,26 +44,6 @@ - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - - org.powermock - powermock-module-junit4 - 1.7.3 - test - - - - org.mockito - mockito-all - 1.10.19 - test - com.h2database h2 @@ -141,12 +117,6 @@ jersey-core 1.18 - - junit - junit - 4.12 - test - javax.websocket javax.websocket-api @@ -170,16 +140,6 @@ 3.1.200-oss test - - org.springframework - spring-mock - 2.0.8 - - - com.mockrunner - mockrunner - 0.3.1 - org.springframework spring-core diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index a2cbc8b37..27c0ec1da 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -19,10 +19,8 @@ ============LICENSE_END========================================================= --> - - 4.0.0 ONAP-PDP ONAP-PDP @@ -33,25 +31,6 @@ 1.2.0-SNAPSHOT - - org.mockito - mockito-core - 1.10.19 - test - - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - - org.powermock - powermock-module-junit4 - 1.7.3 - test - org.onap.policy.engine ${project.version} @@ -102,22 +81,12 @@ - - junit - junit - 4.11 - org.onap.policy.drools-pdp policy-endpoints ${project.version} test - - com.mockrunner - mockrunner - 0.3.1 - diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 920ef216f..6c0b18f32 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -37,26 +37,6 @@ org.yaml snakeyaml 1.16 - - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - - org.powermock - powermock-module-junit4 - 1.7.3 - test - - - - org.mockito - mockito-all - 1.10.19 - test com.h2database @@ -117,22 +97,6 @@ gson 2.8.0 - - junit - junit - 4.11 - test - - - org.springframework - spring-mock - 2.0.8 - - - com.mockrunner - mockrunner - 0.3.1 - org.eclipse.emf org.eclipse.emf.ecore.xmi diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 9e6f1b21c..9f383bf9a 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -27,7 +27,6 @@ ONAP-SDK-APP war - UTF-8 2.1.0 @@ -319,10 +318,5 @@ javax.servlet-api 3.1.0 - - junit - junit - 4.12 - diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 8bfa06b35..4a30cd7b5 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,10 +19,8 @@ ============LICENSE_END========================================================= --> - - 4.0.0 org.onap.policy.engine @@ -32,25 +30,6 @@ ONAP-XACML jar - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - - org.powermock - powermock-module-junit4 - 1.7.3 - test - - - org.mockito - mockito-core - 1.10.19 - test - org.onap.policy.engine ${project.version} @@ -71,28 +50,6 @@ httpcore 4.4.4 - - junit - junit - 4.11 - test - - - org.springframework - spring-mock - 2.0.8 - - - commons-logging - commons-logging - - - - - com.mockrunner - mockrunner - 0.3.1 - com.att.research.xacml xacml diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 3a8eaa456..91e14d9f9 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -253,12 +253,6 @@ yamlbeans 1.08 - - - org.easymock - easymock - 3.1 - org.yaml diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 6ffef7594..69e086978 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -22,35 +22,13 @@ 4.0.0 - org.onap.policy.engine PolicyEngineSuite 1.2.0-SNAPSHOT - PolicyEngineAPI - - - org.powermock - powermock-api-mockito - 1.7.3 - test - - - org.powermock - powermock-module-junit4 - 1.7.3 - test - - - - org.mockito - mockito-all - 1.10.19 - test - com.fasterxml.jackson.core jackson-databind @@ -81,12 +59,6 @@ commons-fileupload ${commons.fileupload.version} - - junit - junit - 4.11 - test - javax.websocket javax.websocket-api @@ -132,12 +104,6 @@ org.onap.policy.engine ONAP-XACML ${project.version} - - - org.powermock - powermock-api-mockito - - diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index ac2b2a1a9..73b6e0463 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -41,16 +41,6 @@ org.onap.policy.common ONAP-Logging ${project.version} - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-core - - org.eclipse.persistence @@ -82,12 +72,6 @@ maven-model 3.3.9 - - junit - junit - 4.11 - test - - default @@ -49,7 +43,6 @@ docker - with-integration-tests @@ -58,7 +51,6 @@ - base install diff --git a/pom.xml b/pom.xml index 660e87e7f..af038fb0d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,22 +20,18 @@ 4.0.0 - org.onap.oparent oparent 1.1.0 - org.onap.policy.engine PolicyEngineSuite 1.2.0-SNAPSHOT pom policy-engine - The ONAP Policy Engine main pom - 1.8 @@ -56,14 +52,10 @@ ${project.basedir}/../target/code-coverage/jacoco-it.exec reuseReports - + 1.4.186 - + 9.2.3.v20140905 @@ -72,8 +64,6 @@ 2.9.4 1.3.3 - - PolicyEngineUtils ONAP-XACML @@ -89,7 +79,6 @@ ONAP-SDK-APP packages - ecomp-releases @@ -106,7 +95,6 @@ dav:${nexusproxy}${sitePath} - @@ -127,7 +115,6 @@ - @@ -138,9 +125,7 @@ - - javax.servlet javax.servlet-api @@ -152,8 +137,51 @@ xml-apis 1.3.03 + + junit + junit + 4.12 + test + + + org.springframework + spring-mock + 2.0.8 + test + + + com.mockrunner + mockrunner + 0.3.1 + test + + + + org.powermock + powermock-api-mockito + 1.7.3 + test + + + org.powermock + powermock-module-junit4 + 1.7.3 + test + + + + org.mockito + mockito-all + 1.10.19 + test + + + org.easymock + easymock + 3.1 + test + - @@ -236,7 +264,6 @@ - org.eclipse.jetty jetty-maven-plugin -- cgit 1.2.3-korg