Ensure json-smart is in right scope

Adding json-smart:2.3 as dependencies to avoid Junit Failure

Issue-ID: CCSDK-1740
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I6a01d344735ded414d9b42b14221cdb447882528

diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index de8827f..358de71 100644 (file)
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>cds-ui-application</name>
+    <name>CDS UI Application</name>
 
     <properties>
         <image.name>onap/ccsdk-cds-ui</image.name>

diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml
index 4217ac5..abf5aff 100644 (file)
--- a/cds-ui/client/pom.xml
+++ b/cds-ui/client/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 ============LICENSE_START==========================================
 ===================================================================
 Copyright (C) 2018 IBM Intellectual Property. All rights reserved.
@@ -32,7 +32,7 @@ limitations under the License.
   <version>0.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>cds-ui-client</name>
+  <name>CDS UI Client</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml
index 34a72bd..56ced89 100644 (file)
--- a/cds-ui/pom.xml
+++ b/cds-ui/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.cds</groupId>
@@ -33,7 +33,7 @@ limitations under the License.
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>cds-ui-parent</name>
+    <name>CDS UI Parent</name>
     <description>Creates Controller Design Studio UI Docker container</description>
 
     <modules>

diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml
index dedf129..4c37667 100644 (file)
--- a/cds-ui/server/pom.xml
+++ b/cds-ui/server/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>cds-ui-server</name>
+    <name>CDS UI Server</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/ms/blueprintsprocessor/distribution/pom.xml b/ms/blueprintsprocessor/distribution/pom.xml
index 884d76a..bbf9239 100755 (executable)
--- a/ms/blueprintsprocessor/distribution/pom.xml
+++ b/ms/blueprintsprocessor/distribution/pom.xml
@@ -84,7 +84,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source"/>
+                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source" />
                             </tasks>
                         </configuration>
                         <goals>

diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml
index 9d50e13..01903a4 100644 (file)
--- a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml
@@ -16,24 +16,24 @@
   ~  limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-    <artifactId>inbounds</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-  </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+        <artifactId>inbounds</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+    </parent>
 
-  <artifactId>health-api</artifactId>
-  <packaging>jar</packaging>
+    <artifactId>health-api</artifactId>
+    <packaging>jar</packaging>
 
-  <name>Blueprints Processor Health API</name>
-  <description>checking system check health endpoints</description>
+    <name>Blueprints Processor Health API</name>
+    <description>checking system check health endpoints</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-      <artifactId>rest-lib</artifactId>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+            <artifactId>rest-lib</artifactId>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 726ba55..ac123cb 100755 (executable)
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -31,28 +31,36 @@
     <description>Blueprints Processor Parent</description>
 
     <properties>
-        <sshd.version>2.2.0</sshd.version>
-        <jsch.version>0.1.55</jsch.version>
+        <sli.version>${ccsdk.sli.core.version}</sli.version>
+        <dmaap.client.version>1.1.5</dmaap.client.version>
+
+        <!-- Should be using released artifact as soon as available: -->
+        <!-- https://github.com/springfox/springfox/milestone/44 -->
+        <springfox.swagger2.version>2.9.2</springfox.swagger2.version>
         <spring.kafka.version>2.2.6.RELEASE</spring.kafka.version>
         <kafka.version>2.2.0</kafka.version>
         <eelf.version>1.0.0</eelf.version>
-        <sli.version>${ccsdk.sli.core.version}</sli.version>
-        <guava.version>27.0.1-jre</guava.version>
-        <jython.version>2.7.1</jython.version>
-        <!--        Should be using released artifact as soon as available:-->
-        <!--        https://github.com/springfox/springfox/milestone/44-->
-        <springfox.swagger2.version>2.9.2</springfox.swagger2.version>
-        <h2database.version>1.4.197</h2database.version>
         <onap.logger.slf4j>1.2.2</onap.logger.slf4j>
+
+        <h2database.version>1.4.197</h2database.version>
         <powermock.version>1.7.4</powermock.version>
-        <dmaap.client.version>1.1.5</dmaap.client.version>
+        <mockkserver.version>5.5.1</mockkserver.version>
+        <json.unit.version>2.8.0</json.unit.version>
+        <xmlunit.version>2.6.3</xmlunit.version>
+
+        <sshd.version>2.2.0</sshd.version>
+        <jsch.version>0.1.55</jsch.version>
+        <jython.version>2.7.1</jython.version>
         <jinja.version>2.5.1</jinja.version>
         <velocity.version>1.7</velocity.version>
-        <json.unit.version>2.8.0</json.unit.version>
-        <mockkserver.version>5.5.1</mockkserver.version>
+        <guava.version>27.0.1-jre</guava.version>
         <jsoup.version>1.10.3</jsoup.version>
-        <xmlunit.version>2.6.3</xmlunit.version>
         <json-patch.version>1.9</json-patch.version>
+        <json-smart.version>2.3</json-smart.version>
+
+        <commons-io-version>2.6</commons-io-version>
+        <commons-lang3-version>3.2.1</commons-lang3-version>
+        <commons-collections-version>3.2.2</commons-collections-version>
     </properties>
 
     <dependencyManagement>
@@ -101,33 +109,36 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>io.springfox</groupId>-->
-<!--                <artifactId>springfox-spring-webflux</artifactId>-->
-<!--                <version>${springfox.swagger2.version}</version>-->
-<!--                <exclusions>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.slf4j</groupId>-->
-<!--                        <artifactId>slf4j-api</artifactId>-->
-<!--                    </exclusion>-->
-<!--                </exclusions>-->
-<!--            </dependency>-->
+
+            <!--
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-spring-webflux</artifactId>
+                <version>${springfox.swagger2.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            -->
 
             <!-- Common Utils Dependencies -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.2.1</version>
+                <version>${commons-lang3-version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
+                <version>${commons-collections-version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.6</version>
+                <version>${commons-io-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
@@ -161,6 +172,11 @@
                 <artifactId>jython-standalone</artifactId>
                 <version>${jython.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>${json-smart.version}</version>
+            </dependency>
 
             <!-- Kotlin Dependencies -->
             <dependency>
@@ -254,7 +270,6 @@
                 <version>${protobuff.java.utils.version}</version>
             </dependency>
 
-
             <!-- Adaptors -->
             <dependency>
                 <groupId>org.apache.sshd</groupId>
@@ -329,7 +344,6 @@
                 </exclusions>
             </dependency>
 
-
             <!-- Blueprint Processor Application Module Dependencies -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
@@ -562,6 +576,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+        </dependency>
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
             <artifactId>json-unit-json-path</artifactId>
@@ -580,10 +598,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>io.springfox</groupId>-->
-<!--            <artifactId>springfox-spring-webflux</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>io.springfox</groupId>-->
+        <!--            <artifactId>springfox-spring-webflux</artifactId>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>

diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml
index 0db7af9..0aad7b4 100755 (executable)
--- a/ms/command-executor/pom.xml
+++ b/ms/command-executor/pom.xml
@@ -37,7 +37,7 @@
         <docker.verbose>true</docker.verbose>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
     <build>

diff --git a/ms/controllerblueprints/README_FIRST.txt b/ms/controllerblueprints/README_FIRST.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml
index eb4dd9f..91097b9 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-proto/pom.xml
+++ b/ms/controllerblueprints/modules/blueprint-proto/pom.xml
@@ -66,19 +66,21 @@
                             </pluginArtifact>
                         </configuration>
                     </execution>
-<!--                    <execution>-->
-<!--                        <id>grpc-coroutines</id>-->
-<!--                        <goals>-->
-<!--                            <goal>compile-custom</goal>-->
-<!--                        </goals>-->
-<!--                        <configuration>-->
-<!--                            <pluginId>kroto-plus</pluginId>-->
-<!--                            <pluginArtifact>-->
-<!--                                com.github.marcoferrer.krotoplus:protoc-gen-kroto-plus:${kroto-plus.version}:jar:jvm8-->
-<!--                            </pluginArtifact>-->
-<!--                            <pluginParameter>ConfigPath=${project.basedir}/krotoPlusConfig.asciipb</pluginParameter>-->
-<!--                        </configuration>-->
-<!--                    </execution>-->
+                    <!--
+                    <execution>
+                        <id>grpc-coroutines</id>
+                        <goals>
+                            <goal>compile-custom</goal>
+                        </goals>
+                        <configuration>
+                            <pluginId>kroto-plus</pluginId>
+                            <pluginArtifact>
+                                com.github.marcoferrer.krotoplus:protoc-gen-kroto-plus:${kroto-plus.version}:jar:jvm8
+                            </pluginArtifact>
+                            <pluginParameter>ConfigPath=${project.basedir}/krotoPlusConfig.asciipb</pluginParameter>
+                        </configuration>
+                    </execution>
+                    -->
                 </executions>
             </plugin>
             <plugin>
@@ -95,7 +97,7 @@
                             <sourceDirs>
                                 <sourceDir>${project.basedir}/target/generated-sources/protobuf/java</sourceDir>
                                 <sourceDir>${project.basedir}/target/generated-sources/protobuf/grpc-java</sourceDir>
-<!--                                <sourceDir>${project.basedir}/target/generated-sources/protobuf/kroto-plus</sourceDir>-->
+                                <!--<sourceDir>${project.basedir}/target/generated-sources/protobuf/kroto-plus</sourceDir>-->
                             </sourceDirs>
                         </configuration>
                     </execution>

diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml
index 40fff14..5bc2e2a 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml
+++ b/ms/controllerblueprints/modules/blueprint-validation/pom.xml
@@ -47,7 +47,6 @@
             <artifactId>resource-dict</artifactId>
         </dependency>
 
-
         <!--Testing dependencies-->
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 62f300c..c5e01a6 100644 (file)
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -36,11 +36,17 @@
         <guava.version>27.0.1-jre</guava.version>
         <kroto-plus.version>0.5.0</kroto-plus.version>
         <springfox.swagger2.version>2.9.2</springfox.swagger2.version>
+
         <h2database.version>1.4.197</h2database.version>
         <onap.logger.slf4j>1.2.2</onap.logger.slf4j>
         <powermock.version>1.7.4</powermock.version>
+
         <jinja.version>2.5.1</jinja.version>
         <velocity.version>1.7</velocity.version>
+        <json-smart.version>2.3</json-smart.version>
+        <commons-io-version>2.6</commons-io-version>
+        <commons-lang3-version>3.2.1</commons-lang3-version>
+        <commons-collections-version>3.2.2</commons-collections-version>
     </properties>
 
     <dependencyManagement>
@@ -87,17 +93,17 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.2.1</version>
+                <version>${commons-lang3-version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
+                <version>${commons-collections-version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.6</version>
+                <version>${commons-io-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
@@ -114,6 +120,11 @@
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>${json-smart.version}</version>
+            </dependency>
 
             <!-- Kotlin Dependencies -->
             <dependency>
@@ -219,7 +230,6 @@
                 <version>${h2database.version}</version>
             </dependency>
 
-
             <!-- Application Components -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
@@ -293,6 +303,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/ms/controllerblueprints/repoproject.txt b/ms/controllerblueprints/repoproject.txt
deleted file mode 100644 (file)
index 91a5c8e..0000000
--- a/ms/controllerblueprints/repoproject.txt
+++ /dev/null
@@ -1 +0,0 @@
-ST_SDNCMS

diff --git a/ms/controllerblueprints/time.txt b/ms/controllerblueprints/time.txt
deleted file mode 100644 (file)
index 6ed29fb..0000000
--- a/ms/controllerblueprints/time.txt
+++ /dev/null
@@ -1 +0,0 @@
-Current time : 17:38:06

diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml
index d1048ac..2e6c183 100644 (file)
--- a/ms/sdclistener/application/pom.xml
+++ b/ms/sdclistener/application/pom.xml
@@ -15,91 +15,91 @@
   ~  limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
 
-  <artifactId>application</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <artifactId>application</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-  <name>SDC Listener Application</name>
+    <name>SDC Listener Application</name>
 
-  <properties>
-    <protobuf.version>3.6.1</protobuf.version>
-    <project.version>${parent.version}</project.version>
-  </properties>
+    <properties>
+        <protobuf.version>3.6.1</protobuf.version>
+        <project.version>${parent.version}</project.version>
+    </properties>
 
-  <dependencies>
-    <!-- Spring boot -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-      <exclusions>
-          <exclusion>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-starter-logging</artifactId>
-          </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
+    <dependencies>
+        <!-- Spring boot -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-    <!-- SDC Distribution client dependency -->
-    <dependency>
-      <groupId>org.onap.sdc.sdc-distribution-client</groupId>
-      <artifactId>sdc-distribution-client</artifactId>
-      <version>1.3.0</version>
-    </dependency>
+        <!-- SDC Distribution client dependency -->
+        <dependency>
+            <groupId>org.onap.sdc.sdc-distribution-client</groupId>
+            <artifactId>sdc-distribution-client</artifactId>
+            <version>1.3.0</version>
+        </dependency>
 
-    <dependency>
-      <groupId>org.jmockit</groupId>
-      <artifactId>jmockit</artifactId>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-    <!-- GRPC Dependencies -->
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
-      <version>${grpc.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-protobuf</artifactId>
-      <version>${grpc.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-stub</artifactId>
-      <version>${grpc.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-testing</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
-      <artifactId>blueprint-proto</artifactId>
-    </dependency>
+        <!-- GRPC Dependencies -->
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
+            <artifactId>blueprint-proto</artifactId>
+        </dependency>
 
-    <dependency>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml
index ca69478..58dabc0 100755 (executable)
--- a/ms/sdclistener/distribution/pom.xml
+++ b/ms/sdclistener/distribution/pom.xml
@@ -85,7 +85,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source"/>
+                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source" />
                             </tasks>
                         </configuration>
                         <goals>

diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml
index 850dfa4..65ca250 100755 (executable)
--- a/ms/sdclistener/parent/pom.xml
+++ b/ms/sdclistener/parent/pom.xml
@@ -183,7 +183,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-
             <!-- Controller Blueprints Application Dependency -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>

diff --git a/pom.xml b/pom.xml
index 8350e1e..41ad1cb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.cds</groupId>
@@ -30,7 +30,7 @@ limitations under the License.
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>cds-parent</name>
+    <name>CDS Parent</name>
     <description>CCSDK Controller Design Studio</description>
     <url>https://wiki.onap.org</url>
     <organization>
@@ -44,7 +44,7 @@ limitations under the License.
 
     <properties>
         <!--Don't set any language to let sonar enable multi-language support-->
-        <sonar.language/>
+        <sonar.language />
         <!--Provide src/main as source path so both src/main/java and src/main/kotlin are scanned-->
         <sonar.sources>src/main</sonar.sources>
         <!--Provide src/test as source path for test so both src/test/java and src/test/kotlin are scanned-->
@@ -52,12 +52,11 @@ limitations under the License.
         <!--Only include java and kt files to the scan-->
         <sonar.inclusions>**/*.java,**/*.kt</sonar.inclusions>
         <!--Specify path to load jacoco XLM report, as Sonar can't load Kotlin coverage from binary report-->
-        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
         <jacoco.version>0.8.3</jacoco.version>
-       
-       <!-- Properties for POM Format -->
-       <format.skipValidate>false</format.skipValidate>
+
+        <!-- Properties for POM Format -->
+        <format.skipValidate>false</format.skipValidate>
         <format.skipExecute>true</format.skipExecute>
     </properties>
 
@@ -69,7 +68,7 @@ limitations under the License.
                 <version>${jacoco.version}</version>
             </plugin>
 
-           <!-- Plugin to Format/Validate POM Files -->
+            <!-- Plugin to Format/Validate POM Files -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>tidy-maven-plugin</artifactId>
@@ -133,8 +132,8 @@ limitations under the License.
             </build>
         </profile>
 
-       <!-- Profile to format skip validate or execute -->
-       <profile>
+        <!-- Profile to format skip validate or execute -->
+        <profile>
             <id>format</id>
             <properties>
                 <format.skipValidate>true</format.skipValidate>