From 0521914ddcde7727ed2dfeafc8bf666ceffd56f3 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Sun, 11 Feb 2018 12:42:11 +0000
Subject: Tidy dependencies and scopes in POMs

There were some duplicate dependencies in the POMs that were causing warnings.
These have been removed. In cases where the revision of the duplicate
dependencies were different,the latest revision was used.

The scope of the "junit" dependency was "provided" in some POMs. These have been
corrected with the scope of "test" being used for junit dependencies.

Issue-ID: POLICY-238

Change-Id: Ib1cc6f040b0c4d7f2b39ae02bc6fb4590d395809
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 controlloop/common/actors/actor.test/pom.xml           |  2 +-
 controlloop/common/eventmanager/pom.xml                |  9 +--------
 controlloop/common/model-impl/rest/pom.xml             |  2 +-
 controlloop/common/model-impl/trafficgenerator/pom.xml |  2 +-
 controlloop/common/model-impl/vfc/pom.xml              |  2 +-
 controlloop/common/policy-yaml/pom.xml                 |  2 +-
 controlloop/common/simulators/pom.xml                  |  6 ------
 controlloop/templates/template.demo/pom.xml            | 12 ------------
 8 files changed, 6 insertions(+), 31 deletions(-)

(limited to 'controlloop')

diff --git a/controlloop/common/actors/actor.test/pom.xml b/controlloop/common/actors/actor.test/pom.xml
index 696ef3ff5..27cb0290d 100644
--- a/controlloop/common/actors/actor.test/pom.xml
+++ b/controlloop/common/actors/actor.test/pom.xml
@@ -58,7 +58,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index fa4941afa..e6d090de9 100644
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -116,7 +116,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -142,13 +142,6 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>vfc</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
diff --git a/controlloop/common/model-impl/rest/pom.xml b/controlloop/common/model-impl/rest/pom.xml
index 940eaa751..2e1303eae 100644
--- a/controlloop/common/model-impl/rest/pom.xml
+++ b/controlloop/common/model-impl/rest/pom.xml
@@ -34,7 +34,7 @@
 		<groupId>junit</groupId>
 		<artifactId>junit</artifactId>
 		<version>4.12</version>
-		<scope>provided</scope>
+		<scope>test</scope>
 	</dependency>
 	<dependency>
 		<groupId>com.google.code.gson</groupId>
diff --git a/controlloop/common/model-impl/trafficgenerator/pom.xml b/controlloop/common/model-impl/trafficgenerator/pom.xml
index f832531f7..fcf9893bb 100644
--- a/controlloop/common/model-impl/trafficgenerator/pom.xml
+++ b/controlloop/common/model-impl/trafficgenerator/pom.xml
@@ -34,7 +34,7 @@
 		<groupId>junit</groupId>
 		<artifactId>junit</artifactId>
 		<version>4.12</version>
-		<scope>provided</scope>
+		<scope>test</scope>
 	</dependency>
 	<dependency>
 		<groupId>com.google.code.gson</groupId>
diff --git a/controlloop/common/model-impl/vfc/pom.xml b/controlloop/common/model-impl/vfc/pom.xml
index ecbda4de2..ffd45cf9e 100644
--- a/controlloop/common/model-impl/vfc/pom.xml
+++ b/controlloop/common/model-impl/vfc/pom.xml
@@ -32,7 +32,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
diff --git a/controlloop/common/policy-yaml/pom.xml b/controlloop/common/policy-yaml/pom.xml
index d15f8705c..efc4d0891 100644
--- a/controlloop/common/policy-yaml/pom.xml
+++ b/controlloop/common/policy-yaml/pom.xml
@@ -52,7 +52,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/controlloop/common/simulators/pom.xml b/controlloop/common/simulators/pom.xml
index 61cffb440..8f92694b8 100644
--- a/controlloop/common/simulators/pom.xml
+++ b/controlloop/common/simulators/pom.xml
@@ -50,12 +50,6 @@
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>so</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
 			<artifactId>vfc</artifactId>
diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index e8f4cd1fb..c501bfd94 100644
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -113,12 +113,6 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>events</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
 			<artifactId>policy-yaml</artifactId>
@@ -149,12 +143,6 @@
 			<version>1.0.2</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.persistence</groupId>
-			<artifactId>org.eclipse.persistence.jpa</artifactId>
-			<version>2.6.4</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
 			<artifactId>actorServiceProvider</artifactId>
-- 
cgit 1.2.3-korg