Controller Blueprints Microservice

Add Powermock compatable version in OpenJDK Ubuntu Machine for Spring boot 2 Junit testcase and clean maven dependencies

Change-Id: Icac038b0d68fdd0edbb1aac9bc2bccb77d627289
Issue-ID: CCSDK-483
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

5 files changed, 67 insertions, 26 deletions

diff --git a/ms/controllerblueprints/application/pom.xml b/ms/controllerblueprints/application/pom.xml
index 4e781ad1b..38f81c169 100644
--- a/ms/controllerblueprints/application/pom.xml
+++ b/ms/controllerblueprints/application/pom.xml
@@ -2,6 +2,8 @@
 <!--

   ~ Copyright © 2017-2018 AT&T Intellectual Property.

   ~

+  ~ Modifications Copyright © 2018 IBM.

+  ~

   ~ Licensed under the Apache License, Version 2.0 (the "License");

   ~ you may not use this file except in compliance with the License.

   ~ You may obtain a copy of the License at

@@ -56,15 +58,25 @@
             <artifactId>spring-boot-starter-actuator</artifactId>

         </dependency>

         <dependency>

-            <groupId>org.springframework.boot</groupId>

-            <artifactId>spring-boot-devtools</artifactId>

-            <optional>true</optional>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-api-mockito2</artifactId>

+            <scope>test</scope>

         </dependency>

         <dependency>

             <groupId>org.springframework.boot</groupId>

             <artifactId>spring-boot-starter-test</artifactId>

             <scope>test</scope>

         </dependency>

+        <dependency>

+            <groupId>org.jetbrains.kotlin</groupId>

+            <artifactId>kotlin-test</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>io.projectreactor</groupId>

+            <artifactId>reactor-test</artifactId>

+            <scope>test</scope>

+        </dependency>

     </dependencies>

     <build>

         <resources>

diff --git a/ms/controllerblueprints/modules/core/pom.xml b/ms/controllerblueprints/modules/core/pom.xml
index 5782c60fc..51b3af357 100644
--- a/ms/controllerblueprints/modules/core/pom.xml
+++ b/ms/controllerblueprints/modules/core/pom.xml
@@ -2,6 +2,8 @@
 <!--

   ~ Copyright © 2017-2018 AT&T Intellectual Property.

   ~

+  ~ Modifications Copyright © 2018 IBM.

+  ~

   ~ Licensed under the Apache License, Version 2.0 (the "License");

   ~ you may not use this file except in compliance with the License.

   ~ You may obtain a copy of the License at

@@ -45,6 +47,15 @@
             <groupId>org.yaml</groupId>

             <artifactId>snakeyaml</artifactId>

         </dependency>

+        <dependency>

+            <groupId>org.jetbrains.kotlin</groupId>

+            <artifactId>kotlin-test</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+        </dependency>

     </dependencies>

 

 </project>

diff --git a/ms/controllerblueprints/modules/resource-dict/pom.xml b/ms/controllerblueprints/modules/resource-dict/pom.xml
index 4f2261853..dbc920fdf 100644
--- a/ms/controllerblueprints/modules/resource-dict/pom.xml
+++ b/ms/controllerblueprints/modules/resource-dict/pom.xml
@@ -2,6 +2,8 @@
 <!--

   ~ Copyright © 2017-2018 AT&T Intellectual Property.

   ~

+  ~ Modifications Copyright © 2018 IBM.

+  ~

   ~ Licensed under the Apache License, Version 2.0 (the "License");

   ~ you may not use this file except in compliance with the License.

   ~ You may obtain a copy of the License at

@@ -33,6 +35,11 @@
             <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

             <artifactId>core</artifactId>

         </dependency>

+        <dependency>

+            <groupId>org.jetbrains.kotlin</groupId>

+            <artifactId>kotlin-test</artifactId>

+            <scope>test</scope>

+        </dependency>

     </dependencies>

 

 

diff --git a/ms/controllerblueprints/modules/service/pom.xml b/ms/controllerblueprints/modules/service/pom.xml
index 6a40a4a71..9efadd189 100644
--- a/ms/controllerblueprints/modules/service/pom.xml
+++ b/ms/controllerblueprints/modules/service/pom.xml
@@ -2,6 +2,8 @@
 <!--

   ~ Copyright © 2017-2018 AT&T Intellectual Property.

   ~

+  ~ Modifications Copyright © 2018 IBM.

+  ~

   ~ Licensed under the Apache License, Version 2.0 (the "License");

   ~ you may not use this file except in compliance with the License.

   ~ You may obtain a copy of the License at

@@ -67,10 +69,25 @@
         <!--</dependency>-->

 

         <dependency>

+            <groupId>org.powermock</groupId>

+            <artifactId>powermock-api-mockito2</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

             <groupId>org.springframework.boot</groupId>

             <artifactId>spring-boot-starter-test</artifactId>

             <scope>test</scope>

         </dependency>

+        <dependency>

+            <groupId>org.jetbrains.kotlin</groupId>

+            <artifactId>kotlin-test</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>io.projectreactor</groupId>

+            <artifactId>reactor-test</artifactId>

+            <scope>test</scope>

+        </dependency>

     </dependencies>

 </project>

 

diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index e48c11342..19e55fe0b 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -2,6 +2,8 @@
 <!--
   ~ Copyright © 2017-2018 AT&T Intellectual Property.
   ~
+  ~ Modifications Copyright © 2018 IBM.
+  ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -116,12 +118,7 @@
                 <artifactId>h2</artifactId>
                 <version>${h2database.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-test</artifactId>
-                <version>${kotlin.version}</version>
-                <scope>test</scope>
-            </dependency>
+
 
             <!-- Application Components -->
             <dependency>
@@ -144,6 +141,20 @@
                 <artifactId>resource-dict</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <!-- Testing Dependencies -->
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito2</artifactId>
+                <version>1.7.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-test</artifactId>
+                <version>${kotlin.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -188,25 +199,8 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
-        <!-- test -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
-
     <build>
         <plugins>
             <plugin>