From 472cab29ed1d8f058ababcef2859353817c79fef Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Mon, 19 Feb 2018 10:16:44 -0500
Subject: so/libs build fails if unit tests are disabled

[ERROR] Failed to execute goal on project nova-client: Could not
resolve dependencies for project org.openecomp.so.libs.openstack-
java-sdk:nova-client:jar:1.2.0-SNAPSHOT: Could not find artifact
org.openecomp.so.libs.openstack-java-sdk:openstack-client:jar:
tests:1.2.0-SNAPSHOT

I've also noticed that the junit and mock artifacts are not
consistently declared with scope "test".

Will fix these issues, and clean up indentation in the poms.

Issue-ID: SO-432
Change-Id: I1e643c288b0cb61f2da6d98832b3aac640073b33
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 keystone-client/pom.xml  | 26 +++++++++---------
 nova-client/pom.xml      | 16 ++++++-----
 nova-model/pom.xml       |  3 ++-
 openstack-client/pom.xml |  8 +++++-
 pom.xml                  | 69 ++++++++++++++++++++++++------------------------
 quantum-client/pom.xml   |  4 +--
 6 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml
index 6c511f4..89b6841 100644
--- a/keystone-client/pom.xml
+++ b/keystone-client/pom.xml
@@ -20,18 +20,18 @@
 			<artifactId>keystone-model</artifactId>
 			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
-        <dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <version>1.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.jmockit</groupId>
+			<artifactId>jmockit</artifactId>
+			<version>1.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/nova-client/pom.xml b/nova-client/pom.xml
index 8e5f93a..c83eb96 100644
--- a/nova-client/pom.xml
+++ b/nova-client/pom.xml
@@ -21,27 +21,31 @@
 			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <version>1.19</version>
-            <scope>test</scope>
-        </dependency>
+			<groupId>org.jmockit</groupId>
+			<artifactId>jmockit</artifactId>
+			<version>1.19</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
 			<artifactId>openstack-client</artifactId>
 			<type>test-jar</type>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/nova-model/pom.xml b/nova-model/pom.xml
index cc78c7a..81aa22e 100644
--- a/nova-model/pom.xml
+++ b/nova-model/pom.xml
@@ -14,6 +14,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml
index 671f257..fc47940 100644
--- a/openstack-client/pom.xml
+++ b/openstack-client/pom.xml
@@ -15,14 +15,17 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -38,10 +41,13 @@
                         <goals>
                             <goal>test-jar</goal>
                         </goals>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 4cec6f9..32186a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,40 +78,41 @@
 			<url>http://repo2.maven.org/maven2/</url>
 		</pluginRepository>
 	</pluginRepositories>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.11</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>1.10.19</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito</artifactId>
-                <version>1.6.2</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-module-junit4</artifactId>
-                <version>1.6.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
-                <artifactId>openstack-client</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.11</version>
+				<scope>test</scope>
+			</dependency>
+				<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-all</artifactId>
+				<version>1.10.19</version>
+				<scope>test</scope>
+			</dependency>
+				<dependency>
+				<groupId>org.powermock</groupId>
+				<artifactId>powermock-api-mockito</artifactId>
+				<version>1.6.2</version>
+				<scope>test</scope>
+			</dependency>
+				<dependency>
+				<groupId>org.powermock</groupId>
+				<artifactId>powermock-module-junit4</artifactId>
+				<version>1.6.2</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
+				<artifactId>openstack-client</artifactId>
+				<version>${project.version}</version>
+				<type>test-jar</type>
+				<scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml
index 50d63b5..5a6c702 100644
--- a/quantum-client/pom.xml
+++ b/quantum-client/pom.xml
@@ -10,12 +10,12 @@
 	<name>OpenStack Quantum Client</name>
 	<description>OpenStack Quantum Client</description>
 	<dependencies>
-            <dependency>
+		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
 			<scope>test</scope>
-	    </dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
 			<artifactId>openstack-client</artifactId>
-- 
cgit