From 68945ddb6e7c376ffb5696dddffbb99b33e6dbcc Mon Sep 17 00:00:00 2001
From: vempo <vitaliy.emporopulo@amdocs.com>
Date: Sun, 8 Jul 2018 11:29:54 +0300
Subject: Specified test scope for junit/testng/mockito

In some modules junit, testng, and mockito where included
with default scope. Also, fixed the versions to reference
a property from a parent pom.

Change-Id: I2477bc631a7593c7176087c9088d2c9f2c2a34ee
Issue-ID: SDC-1065
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
---
 .../onap-configuration-management-core/pom.xml     |  1 -
 .../onap-configuration-management-test/pom.xml     | 48 ++-------------
 .../onap-sdc-artifact-generator-test/pom.xml       | 70 ++++++++++------------
 .../openecomp-sdc-healthcheck-manager/pom.xml      |  5 +-
 .../openecomp-sdc-item-permissions-manager/pom.xml |  4 +-
 .../openecomp-sdc-validation-manager/pom.xml       |  5 --
 .../openecomp-config-lib/pom.xml                   |  6 --
 .../openecomp-item-permissions-core/pom.xml        |  2 +
 .../openecomp-item-permissions-impl/pom.xml        |  6 ++
 .../openecomp-sdc-notification-core/pom.xml        |  2 +-
 .../pom.xml                                        |  2 +-
 .../activity-spec-service/pom.xml                  |  5 ++
 services/activity-spec/pom.xml                     |  5 ++
 13 files changed, 64 insertions(+), 97 deletions(-)

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 a05a95ee60..ad2be72c2a 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <name>onap-configuration-management-core</name>
-    <groupId>org.onap.sdc.common</groupId>
     <artifactId>onap-configuration-management-core</artifactId>
 
     <parent>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml
index 36065f3e57..64ed8a84b1 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml
@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <name>onap-configuration-management-test</name>
-    <groupId>org.onap.sdc.common</groupId>
     <artifactId>onap-configuration-management-test</artifactId>
 
     <parent>
@@ -15,55 +14,20 @@
 
     <dependencies>
         <dependency>
-	    <groupId>org.onap.sdc.common</groupId>
-	    <artifactId>onap-configuration-management-core</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-
+            <groupId>org.onap.sdc.common</groupId>
+            <artifactId>onap-configuration-management-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>${junit.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-           <!-- <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin-->
-            <!--<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${mvn.surefire.version}</version>
-            </plugin>-->
-            <!-- any other plugins -->
-           <!-- <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>${mvn.shade.version}</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>com.google.guava:*</exclude>
-                                </excludes>
-                            </artifactSet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>-->
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml
index 48a16a3575..e3818934f4 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml
@@ -17,51 +17,45 @@
         <plugins>
             <!-- any other plugins -->
             <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>${mvn.shade.version}</version>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>shade</goal>
-                    </goals>
-                    <configuration>
-                        <artifactSet>
-                            <excludes>
-                                <exclude>com.google.guava:*</exclude>
-                            </excludes>
-                        </artifactSet>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${mvn.shade.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>com.google.guava:*</exclude>
+                                </excludes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
 
     <dependencies>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>compile</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.sdc.common</groupId>
+            <artifactId>onap-sdc-artifact-generator-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.sdc.common</groupId>
+            <artifactId>onap-sdc-artifact-generator-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
-    <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.11</version>
-    </dependency>
-    <dependency>
-        <groupId>org.onap.sdc.common</groupId>
-        <artifactId>onap-sdc-artifact-generator-api</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-        <groupId>org.onap.sdc.common</groupId>
-        <artifactId>onap-sdc-artifact-generator-core</artifactId>
-        <version>${project.version}</version>
-    </dependency>
     </dependencies>
 
 </project>
diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml
index a667f487b3..f2db4d382d 100644
--- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml
@@ -44,12 +44,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <version>${mockito.all.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
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 6fddbe4ddf..8cf113dc32 100644
--- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml
@@ -60,11 +60,13 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>${testng.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>RELEASE</version>
+            <version>${mockito.all.version}</version>
+            <scope>test</scope>
         </dependency>
 </dependencies>
 
diff --git a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml
index 266c354dd0..fa3ccd64ac 100644
--- a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml
@@ -36,11 +36,6 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.openecomp.sdc</groupId>
-            <artifactId>openecomp-sdc-translator-api</artifactId>
-            <version>${project.version}</version>
-        </dependency-->
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>openecomp-sdc-translator-core</artifactId>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
index c9b05556b0..e5aec475b6 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml
@@ -25,12 +25,6 @@
             <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.openecomp.sdc</groupId>
-            <artifactId>openecomp-sdc-vendor-software-product-api</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency-->
     </dependencies>
 
 </project>
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 e6922e778f..3b6027e36d 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
@@ -20,6 +20,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>${servlet-api.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.core</groupId>
@@ -50,6 +51,7 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <version>${mockito.all.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
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 3d804612ca..06b4ee8fc8 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
@@ -23,6 +23,12 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>${mockito.all.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
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 be2474fade..76a8063110 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
@@ -23,7 +23,7 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
-            <version>1.10.19</version>
+            <version>${mockito.all.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
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 8511b6e71e..4beda3bcbc 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
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
index 14fba4f3a7..f31fe49974 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
+++ b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
@@ -89,6 +89,11 @@
             <scope>test</scope>
             <version>${testng.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/services/activity-spec/pom.xml b/services/activity-spec/pom.xml
index 653ebec903..a5c8358c0b 100644
--- a/services/activity-spec/pom.xml
+++ b/services/activity-spec/pom.xml
@@ -102,6 +102,11 @@
                 <version>1.16.20</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>${mockito.all.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
-- 
cgit 1.2.3-korg