aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbobbymander <bobby.mander@att.com>2018-03-28 15:05:33 -0400
committerbobbymander <bobby.mander@att.com>2018-03-28 15:07:15 -0400
commitcc02160dfa3a7a201b79fe11ceaa51e431be7341 (patch)
tree3f24dd1ef18ef75fd7e750ca35912a2a002680f1
parent95a5bc9816c0bdf56b4ea6699004eb29940ddc6a (diff)
POM changes to centralize test scope deps
Issue-ID: POLICY-600 Change-Id: I870317bbd125c6016818ec435ea7a406123c66c1 Signed-off-by: bobbymander <bobby.mander@att.com>
Diffstat
-rw-r--r--BRMSGateway/pom.xml19
-rw-r--r--LogParser/pom.xml47
-rw-r--r--ONAP-PAP-REST/pom.xml40
-rw-r--r--ONAP-PDP-REST/pom.xml40
-rw-r--r--ONAP-PDP/pom.xml31
-rw-r--r--ONAP-REST/pom.xml36
-rw-r--r--ONAP-SDK-APP/pom.xml6
-rw-r--r--ONAP-XACML/pom.xml45
-rw-r--r--POLICY-SDK-APP/pom.xml6
-rw-r--r--PolicyEngineAPI/pom.xml34
-rw-r--r--PolicyEngineUtils/pom.xml16
-rw-r--r--packages/pom.xml10
-rw-r--r--pom.xml65
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
@@ -46,12 +46,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.3.9</version>
@@ -123,19 +117,6 @@
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>LogParser</artifactId>
-
<dependencies>
<dependency>
<groupId>com.h2database</groupId>
@@ -44,27 +42,11 @@
<groupId>org.onap.policy.common</groupId>
<artifactId>ONAP-Logging</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>integrity-monitor</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -86,23 +68,6 @@
<artifactId>eclipselink</artifactId>
<version>2.6.0</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.7.22</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- </dependency>
<dependency>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineUtils</artifactId>
@@ -130,18 +95,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>ONAP-PAP-REST</artifactId>
<description>ONAP-PAP-REST</description>
@@ -109,16 +108,6 @@
<groupId>org.onap.policy.common</groupId>
<artifactId>ONAP-Logging</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -177,12 +166,6 @@
<version>3.2.0.201312181205-r</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>8.0.24</version>
@@ -212,20 +195,10 @@
<version>2.1.1</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
<artifactId>policy-yaml</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- <version>0.3.1</version>
- </dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
@@ -331,19 +304,6 @@
<artifactId>tomcat-dbcp</artifactId>
<version>8.5.9</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
<springframework.version>4.3.3.RELEASE</springframework.version>
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 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
-
<artifactId>ONAP-PDP-REST</artifactId>
-
<description>ONAP PDP REST</description>
<properties>
<springframework.version>4.3.3.RELEASE</springframework.version>
@@ -48,26 +44,6 @@
</plugins>
</build>
<dependencies>
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -142,12 +118,6 @@
<version>1.18</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>1.1</version>
@@ -172,16 +142,6 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>com.mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- <version>0.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${springframework.version}</version>
</dependency>
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=========================================================
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>ONAP-PDP</artifactId>
<description>ONAP-PDP</description>
@@ -34,25 +32,6 @@
</parent>
<dependencies>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.onap.policy.engine</groupId>
<version>${project.version}</version>
<artifactId>ONAP-REST</artifactId>
@@ -103,21 +82,11 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- </dependency>
- <dependency>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>policy-endpoints</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- <version>0.3.1</version>
- </dependency>
</dependencies>
</project>
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
@@ -38,26 +38,6 @@
<artifactId>snakeyaml</artifactId>
<version>1.16</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -118,22 +98,6 @@
<version>2.8.0</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>com.mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- <version>0.3.1</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<version>2.11.0-v20150123-0347</version>
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 @@
</parent>
<artifactId>ONAP-SDK-APP</artifactId>
<packaging>war</packaging>
-
<properties>
<encoding>UTF-8</encoding>
<epsdk.version>2.1.0</epsdk.version>
@@ -319,10 +318,5 @@
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
</dependencies>
</project>
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=========================================================
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.engine</groupId>
@@ -32,25 +30,6 @@
<artifactId>ONAP-XACML</artifactId>
<packaging>jar</packaging>
<dependencies>
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.onap.policy.engine</groupId>
<version>${project.version}</version>
@@ -72,28 +51,6 @@
<version>4.4.4</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- <version>0.3.1</version>
- </dependency>
- <dependency>
<groupId>com.att.research.xacml</groupId>
<artifactId>xacml</artifactId>
<version>1.0.1</version>
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 @@
<artifactId>yamlbeans</artifactId>
<version>1.08</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.easymock/easymock -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.1</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
<dependency>
<groupId>org.yaml</groupId>
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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
-
<artifactId>PolicyEngineAPI</artifactId>
<dependencies>
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -82,12 +60,6 @@
<version>${commons.fileupload.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>1.1</version>
@@ -132,12 +104,6 @@
<groupId>org.onap.policy.engine</groupId>
<artifactId>ONAP-XACML</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
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 @@
<groupId>org.onap.policy.common</groupId>
<artifactId>ONAP-Logging</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -82,12 +72,6 @@
<artifactId>maven-model</artifactId>
<version>3.3.9</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
<!--
CLM security fix - force use of xstream
Remove this if a new version of drools-verifier is upgraded
diff --git a/packages/pom.xml b/packages/pom.xml
index 4e2885e22..6aff96da7 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -2,7 +2,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.
@@ -20,24 +20,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
-
<artifactId>packages</artifactId>
<packaging>pom</packaging>
-
<name>Policy Packages</name>
<description>D2 ONAP Policy Installation Packages</description>
-
<profiles>
<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
-
<profile>
<id>default</id>
<activation>
@@ -49,7 +43,6 @@
<module>docker</module>
</modules>
</profile>
-
<profile>
<id>with-integration-tests</id>
<modules>
@@ -58,7 +51,6 @@
</modules>
</profile>
</profiles>
-
<modules>
<module>base</module>
<module>install</module>
diff --git a/pom.xml b/pom.xml
index 660e87e7f..af038fb0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,22 +20,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
<version>1.1.0</version>
<relativePath/>
</parent>
-
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-engine</name>
-
<description>The ONAP Policy Engine main pom</description>
-
<properties>
<!-- Project common build settings -->
<project.source.version>1.8</project.source.version>
@@ -56,14 +52,10 @@
<sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
- <!--
- Shared between policy/* project repositories - same version
- -->
+ <!-- Shared between policy/* project repositories - same version -->
<h2.version>1.4.186</h2.version>
- <!--
- Shared between policy/* project repositories - different version
- -->
+ <!-- Shared between policy/* project repositories - different version -->
<!-- Project common dependency versions -->
<jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
@@ -72,8 +64,6 @@
<jackson.version>2.9.4</jackson.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
</properties>
-
-
<modules>
<module>PolicyEngineUtils</module>
<module>ONAP-XACML</module>
@@ -89,7 +79,6 @@
<module>ONAP-SDK-APP</module>
<module>packages</module>
</modules>
-
<distributionManagement>
<repository>
<id>ecomp-releases</id>
@@ -106,7 +95,6 @@
<url>dav:${nexusproxy}${sitePath}</url>
</site>
</distributionManagement>
-
<reporting>
<plugins>
<plugin>
@@ -127,7 +115,6 @@
</plugin>
</plugins>
</reporting>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -138,9 +125,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<dependencies>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -152,8 +137,51 @@
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <version>2.0.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
+ <version>0.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.7.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.7.3</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -236,7 +264,6 @@
</plugin>
<!-- The Jetty plugin allows us to easily test the development build by
running jetty:run on the command line. -->
-
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>