use policy/parent awaitility

Also cleaned up a bunch of these pom's, they do not all need to
declare JUnit, assertjr, mockito testing classes. Can use more
cleanup in some other common dependencies, but we'll defer.

Issue-ID: POLICY-2381
Change-Id: Ib1149a0cd0215d1a38d5b625634440413cf79089
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/controlloop/common/controller-usecases/pom.xml b/controlloop/common/controller-usecases/pom.xml
index a3f5335..795b96f 100644 (file)
--- a/controlloop/common/controller-usecases/pom.xml
+++ b/controlloop/common/controller-usecases/pom.xml
@@ -184,23 +184,12 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.models.policy-models-interactions</groupId>
             <artifactId>simulators</artifactId>
             <version>${policy.models.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>4.0.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/controlloop/common/coordination/pom.xml b/controlloop/common/coordination/pom.xml
index 03220e9..e540f2b 100644 (file)
--- a/controlloop/common/coordination/pom.xml
+++ b/controlloop/common/coordination/pom.xml
@@ -30,22 +30,12 @@
   <artifactId>coordination</artifactId>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-management</artifactId>
       <version>${version.policy.drools-pdp}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-    <groupId>org.assertj</groupId>
-    <artifactId>assertj-core</artifactId>
-    <scope>test</scope>
-</dependency>
   </dependencies>
     <build>
         <plugins>

diff --git a/controlloop/common/database/pom.xml b/controlloop/common/database/pom.xml
index 12f2c8b..e202da7 100644 (file)
--- a/controlloop/common/database/pom.xml
+++ b/controlloop/common/database/pom.xml
@@ -41,11 +41,6 @@
       <artifactId>lombok</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -57,16 +52,6 @@
       <version>${version.policy.drools-pdp}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
     <build>
         <plugins>

diff --git a/controlloop/common/domains/pom.xml b/controlloop/common/domains/pom.xml
index c278cb5..fa30cea 100644 (file)
--- a/controlloop/common/domains/pom.xml
+++ b/controlloop/common/domains/pom.xml
@@ -31,24 +31,12 @@
     <artifactId>domains</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.onap.policy.drools-pdp</groupId>
             <artifactId>policy-management</artifactId>
             <version>${version.policy.drools-pdp}</version>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index 8848170..3cd069f 100644 (file)
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -154,21 +154,6 @@
             <groupId>org.onap.ccsdk.cds.components</groupId>
             <artifactId>proto-definition</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

diff --git a/controlloop/common/feature-controlloop-amsterdam/pom.xml b/controlloop/common/feature-controlloop-amsterdam/pom.xml
index 4298011..8d7b3ec 100644 (file)
--- a/controlloop/common/feature-controlloop-amsterdam/pom.xml
+++ b/controlloop/common/feature-controlloop-amsterdam/pom.xml
@@ -96,10 +96,5 @@
             <version>${version.policy.drools-pdp}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml
index 75c38bc..8c68216 100644 (file)
--- a/controlloop/common/feature-controlloop-management/pom.xml
+++ b/controlloop/common/feature-controlloop-management/pom.xml
@@ -277,27 +277,6 @@
             <artifactId>cds</artifactId>
             <version>${policy.models.version}</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>3.0.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.powermock</groupId>
-          <artifactId>powermock-api-mockito2</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.assertj</groupId>
-          <artifactId>assertj-core</artifactId>
-          <scope>test</scope>
-        </dependency>
         <dependency>
           <groupId>org.onap.policy.models.policy-models-interactions</groupId>
           <artifactId>simulators</artifactId>

diff --git a/controlloop/common/feature-controlloop-trans/pom.xml b/controlloop/common/feature-controlloop-trans/pom.xml
index d6e43cd..02489b3 100644 (file)
--- a/controlloop/common/feature-controlloop-trans/pom.xml
+++ b/controlloop/common/feature-controlloop-trans/pom.xml
@@ -143,17 +143,6 @@
             <version>${version.policy.drools-pdp}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>3.0.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/controlloop/common/feature-controlloop-utils/pom.xml b/controlloop/common/feature-controlloop-utils/pom.xml
index 9bed5a5..670cba3 100644 (file)
--- a/controlloop/common/feature-controlloop-utils/pom.xml
+++ b/controlloop/common/feature-controlloop-utils/pom.xml
@@ -131,10 +131,5 @@
       <artifactId>rest</artifactId>
       <version>${policy.models.version}</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/controlloop/common/guard/pom.xml b/controlloop/common/guard/pom.xml
index b3ef2b0..001325d 100644 (file)
--- a/controlloop/common/guard/pom.xml
+++ b/controlloop/common/guard/pom.xml
@@ -74,11 +74,6 @@
             </exclusion>
         </exclusions>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

diff --git a/controlloop/common/simulators/pom.xml b/controlloop/common/simulators/pom.xml
index bde8a5c..924de88 100644 (file)
--- a/controlloop/common/simulators/pom.xml
+++ b/controlloop/common/simulators/pom.xml
@@ -37,11 +37,6 @@
       <artifactId>policy-endpoints</artifactId>
       <version>${version.policy.common}</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
       <artifactId>aai</artifactId>

diff --git a/controlloop/m2/adapters/pom.xml b/controlloop/m2/adapters/pom.xml
index b4cd290..ed42b27 100644 (file)
--- a/controlloop/m2/adapters/pom.xml
+++ b/controlloop/m2/adapters/pom.xml
@@ -31,12 +31,6 @@
   <name>adapters</name>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.m2</groupId>
       <artifactId>base</artifactId>

diff --git a/controlloop/m2/appclcm/pom.xml b/controlloop/m2/appclcm/pom.xml
index 8c4ff90..fc14fba 100644 (file)
--- a/controlloop/m2/appclcm/pom.xml
+++ b/controlloop/m2/appclcm/pom.xml
@@ -70,17 +70,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>

diff --git a/controlloop/m2/base/pom.xml b/controlloop/m2/base/pom.xml
index 02df1ee..64d3da9 100644 (file)
--- a/controlloop/m2/base/pom.xml
+++ b/controlloop/m2/base/pom.xml
@@ -83,23 +83,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>

diff --git a/controlloop/m2/guard/pom.xml b/controlloop/m2/guard/pom.xml
index 895cb6c..fae0c27 100644 (file)
--- a/controlloop/m2/guard/pom.xml
+++ b/controlloop/m2/guard/pom.xml
@@ -31,18 +31,6 @@
   <artifactId>guard</artifactId>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.m2</groupId>
       <artifactId>util</artifactId>
@@ -80,16 +68,5 @@
       <artifactId>h2</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/controlloop/m2/lock/pom.xml b/controlloop/m2/lock/pom.xml
index 00ea2a8..d60737b 100644 (file)
--- a/controlloop/m2/lock/pom.xml
+++ b/controlloop/m2/lock/pom.xml
@@ -45,11 +45,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>

diff --git a/controlloop/m2/test/pom.xml b/controlloop/m2/test/pom.xml
index c389be5..141f43b 100644 (file)
--- a/controlloop/m2/test/pom.xml
+++ b/controlloop/m2/test/pom.xml
@@ -91,10 +91,5 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/controlloop/m2/util/pom.xml b/controlloop/m2/util/pom.xml
index 12f6ba7..38686c4 100644 (file)
--- a/controlloop/m2/util/pom.xml
+++ b/controlloop/m2/util/pom.xml
@@ -37,23 +37,5 @@
       <version>${version.policy.drools-pdp}</version>
       <scope>provided</scope>
     </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index 56f04bf..b2d6aff 100644 (file)
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -206,11 +206,6 @@
       <version>${protobuf.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>

diff --git a/pom.xml b/pom.xml
index a0edf45..7fab869 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -178,6 +178,36 @@
             <artifactId>logback-classic</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>