Upgrade Node & npm version

Change-Id: Ib41da68543824be671e162eb6c0ba78ded1949cb
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2685

4 files changed, 958 insertions, 955 deletions

diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 5032d86c2d..b026968e86 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -1,159 +1,155 @@
-<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">
+<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>
-	
-	<artifactId>catalog-ui</artifactId>
-    <packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
 
+  <artifactId>catalog-ui</artifactId>
+  <packaging>pom</packaging>
 
-	<parent>
-		<groupId>org.openecomp.sdc</groupId>
-		<artifactId>sdc-main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
-	</parent>
+  <parent>
+    <groupId>org.openecomp.sdc</groupId>
+    <artifactId>sdc-main</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+  </parent>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>clean.fe.webapp.folder</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <configuration>
 
+              <filesets>
+                <fileset>
+                  <directory>${project.parent.basedir}/catalog-fe/src/main/webapp</directory>
+                  <includes>
+                    <include>**/*</include>
+                    <include>*</include>
+                  </includes>
+                  <excludes>
+                    <exclude>META-INF/*</exclude>
+                    <exclude>WEB-INF/*</exclude>
+                  </excludes>
+                  <followSymlinks>false</followSymlinks>
+                </fileset>
+              </filesets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp
+              </outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}/dist</directory>
+                  <filtering>false</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
+        <configuration>
+          <installDirectory>${project.parent.basedir}</installDirectory>
+        </configuration>
 
-	<build>
-		<plugins>
-			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>clean.fe.webapp.folder</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
+        <executions>
+          <execution>
+            <id>install node and npm</id>
+            <goals>
+              <goal>install-node-and-npm</goal>
+            </goals>
+            <configuration>
+              <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
+              <nodeVersion>v10.17.0</nodeVersion>
+              <npmVersion>6.11.3</npmVersion>
+            </configuration>
+          </execution>
 
-                            <filesets>
-                                <fileset>
-                                    <directory>${project.parent.basedir}/catalog-fe/src/main/webapp</directory>
-                                    <includes>
-                                        <include>**/*</include>
-                                        <include>*</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>META-INF/*</exclude>
-                                        <exclude>WEB-INF/*</exclude>
-                                    </excludes>
-                                    <followSymlinks>false</followSymlinks>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution>
-                </executions>
-			</plugin>
+          <execution>
+            <id>npm set progress off</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>set progress=false</arguments>
+            </configuration>
+          </execution>
 
+          <execution>
+            <id>npm install</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <!-- Optional configuration which provides for running any npm command -->
+            <configuration>
+              <arguments>install --registry ${npm.registry}</arguments>
+            </configuration>
+          </execution>
 
-			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${project.basedir}/dist</directory>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <configuration>
-        			<installDirectory>${project.parent.basedir}</installDirectory>
-   				</configuration>
+          <execution>
+            <id>npm run build</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>run build:prod</arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.sylvainlaurent.maven</groupId>
+        <artifactId>yaml-json-validator-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+            <configuration>
+              <validationSets>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.y*ml</include>
+                    <include>src/test/resources/**/*.y*ml</include>
+                  </includes>
+                </validationSet>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.json</include>
+                    <include>src/test/resources/**/*.json</include>
+                  </includes>
+                </validationSet>
+              </validationSets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-                <executions>
-                    <execution>
-                        <id>install node and npm</id>
-                        <goals>
-                            <goal>install-node-and-npm</goal>
-                        </goals>
-                        <configuration>
-                            <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
-                            <nodeVersion>v6.9.5</nodeVersion>
-                            <npmVersion>3.10.10</npmVersion>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                    	<id>npm set progress off</id>
-                    	<goals>
-                    		<goal>npm</goal>
-                    	</goals>
-                    	<configuration>
-                    		<arguments>set progress=false</arguments>
-                    	</configuration>
-                    </execution>
-
-                    <execution>
-                        <id>npm install</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <!-- Optional configuration which provides for running any npm command -->
-                        <configuration>
-                            <arguments>install --registry ${npm.registry}</arguments>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>npm run build</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>run build:prod</arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.github.sylvainlaurent.maven</groupId>
-                <artifactId>yaml-json-validator-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>validate</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>validate</goal>
-                        </goals>
-                        <configuration>
-                            <validationSets>
-                                <validationSet>
-                                    <includes>
-                                        <include>src/main/resources/**/*.y*ml</include>
-                                        <include>src/test/resources/**/*.y*ml</include>
-                                    </includes>
-                                </validationSet>
-                                <validationSet>
-                                    <includes>
-                                        <include>src/main/resources/**/*.json</include>
-                                        <include>src/test/resources/**/*.json</include>
-                                    </includes>
-                                </validationSet>
-                            </validationSets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-		</plugins>
-	</build>
+    </plugins>
+  </build>
 </project>
-
diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
index 18e16d10bb..b434408c1a 100644
--- a/cucumber-js-test-apis-ci/pom.xml
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<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">
+<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>
   <parent>
     <groupId>org.openecomp.sdc</groupId>
@@ -8,7 +10,6 @@
   </parent>
   <artifactId>cucumber-bdd</artifactId>
   <name>cucumber-bdd</name>
-  <groupId>org.openecomp.sdc</groupId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <build>
@@ -69,7 +70,6 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>1.6</version>
 
         <configuration>
           <installDirectory>${project.parent.parent.basedir}</installDirectory>
@@ -83,8 +83,8 @@
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-              <nodeVersion>v10.15.3</nodeVersion>
-              <npmVersion>6.4.1</npmVersion>
+              <nodeVersion>v10.17.0</nodeVersion>
+              <npmVersion>6.11.3</npmVersion>
             </configuration>
           </execution>
           <execution>
@@ -134,7 +134,6 @@
           <plugin>
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.6</version>
 
             <configuration>
               <workingDirectory>${project.basedir}</workingDirectory>
@@ -200,7 +199,8 @@
                   <goal>copy-resources</goal>
                 </goals>
                 <configuration>
-                  <outputDirectory>${project.build.directory}/docker_assembly/cucumber</outputDirectory>
+                  <outputDirectory>${project.build.directory}/docker_assembly/cucumber
+                  </outputDirectory>
                   <resources>
                     <resource>
                       <directory>${basedir}</directory>
@@ -243,7 +243,9 @@
                     <dockerFileDir>${project.build.directory}/docker_assembly</dockerFileDir>
                     <tags>
                       <tag>${docker.tag}</tag>
-                      <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                      <tag>
+                        ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+                      </tag>
                     </tags>
                   </build>
                 </image>
@@ -258,7 +260,9 @@
                 </goals>
                 <configuration>
                   <removeAll>true</removeAll>
-                  <image>onap/cucumber-sdc-api-tests</image>
+                  <images>
+                    <image>onap/cucumber-sdc-api-tests</image>
+                  </images>
                 </configuration>
               </execution>
               <execution>
@@ -275,7 +279,9 @@
                   <goal>push</goal>
                 </goals>
                 <configuration>
-                  <image>onap/cucumber-sdc-api-tests</image>
+                  <images>
+                    <image>onap/cucumber-sdc-api-tests</image>
+                  </images>
                 </configuration>
               </execution>
             </executions>
diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml
index 1f20ebbf11..4848e71705 100644
--- a/openecomp-ui/pom.xml
+++ b/openecomp-ui/pom.xml
@@ -1,211 +1,210 @@
 <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>
+  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>
 
-    <artifactId>onboarding-fe</artifactId>
-    <name>onboarding-ui-war</name>
-    <packaging>war</packaging>
+  <artifactId>onboarding-fe</artifactId>
+  <name>onboarding-ui-war</name>
+  <packaging>war</packaging>
 
-    <parent>
-        <groupId>org.openecomp.sdc</groupId>
-        <artifactId>sdc-onboarding</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-        <relativePath>../onboarding</relativePath>
-    </parent>
+  <parent>
+    <groupId>org.openecomp.sdc</groupId>
+    <artifactId>sdc-onboarding</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../onboarding</relativePath>
+  </parent>
 
-    <properties>
-        <maven.war.plugin.version>3.0.0</maven.war.plugin.version>
-        <app.context.path>onboarding</app.context.path>
-        <jest.command />
-    </properties>
+  <properties>
+    <maven.war.plugin.version>3.0.0</maven.war.plugin.version>
+    <app.context.path>onboarding</app.context.path>
+    <jest.command/>
+  </properties>
 
-    <!-- ============================================= -->
-    <!-- Profile for windows to run jest one by the other due to current defect in node-graceful-js creating race condition -->
-    <!-- https://github.com/isaacs/node-graceful-fs/pull/119 -->
-    <!-- ============================================= -->
-    <profiles>
-        <profile>
-            <id>jest-windows-profile</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <properties>
-                <jest.command>--runInBand</jest.command>
-            </properties>
-        </profile>
-    </profiles>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.6.1</version>
-                <executions>
-                    <execution>
-                        <id>clean.dist.folder</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${basedir}/dist</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>${basedir}/coverage</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>${basedir}/../dox-sequence-diagram-ui/dist
-                                    </directory>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>clean.nodemodules.folder</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipUICleanup}</skip>
-                            <filesets>
-                                <fileset>
-                                    <directory>${basedir}/node_modules</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>${basedir}/../dox-sequence-diagram-ui/node_modules
-                                    </directory>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+  <!-- ============================================= -->
+  <!-- Profile for windows to run jest one by the other due to current defect in node-graceful-js creating race condition -->
+  <!-- https://github.com/isaacs/node-graceful-fs/pull/119 -->
+  <!-- ============================================= -->
+  <profiles>
+    <profile>
+      <id>jest-windows-profile</id>
+      <activation>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <jest.command>--runInBand</jest.command>
+      </properties>
+    </profile>
+  </profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.6.1</version>
+        <executions>
+          <execution>
+            <id>clean.dist.folder</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>${basedir}/dist</directory>
+                </fileset>
+                <fileset>
+                  <directory>${basedir}/coverage</directory>
+                </fileset>
+                <fileset>
+                  <directory>${basedir}/../dox-sequence-diagram-ui/dist
+                  </directory>
+                </fileset>
+              </filesets>
+            </configuration>
+          </execution>
+          <execution>
+            <id>clean.nodemodules.folder</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <configuration>
+              <skip>${skipUICleanup}</skip>
+              <filesets>
+                <fileset>
+                  <directory>${basedir}/node_modules</directory>
+                </fileset>
+                <fileset>
+                  <directory>${basedir}/../dox-sequence-diagram-ui/node_modules
+                  </directory>
+                </fileset>
+              </filesets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-            <!-- ============================================= -->
-            <!-- Build the UI module node code -->
-            <!-- ============================================= -->
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.6</version>
+      <!-- ============================================= -->
+      <!-- Build the UI module node code -->
+      <!-- ============================================= -->
+      <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
 
-                <configuration>
-                    <installDirectory>${project.parent.parent.basedir}</installDirectory>
-                </configuration>
+        <configuration>
+          <installDirectory>${project.parent.parent.basedir}</installDirectory>
+        </configuration>
 
-                <executions>
+        <executions>
 
-                    <execution>
-                        <id>install node and yarn</id>
-                        <goals>
-                            <goal>install-node-and-yarn</goal>
-                        </goals>
-                        <configuration>
-                            <nodeVersion>v9.4.0</nodeVersion>
-                            <yarnVersion>v1.7.0</yarnVersion>
-                        </configuration>
-                    </execution>
+          <execution>
+            <id>install node and yarn</id>
+            <goals>
+              <goal>install-node-and-yarn</goal>
+            </goals>
+            <configuration>
+              <nodeVersion>v10.17.0</nodeVersion>
+              <yarnVersion>v1.19.1</yarnVersion>
+            </configuration>
+          </execution>
 
-                    <execution>
-                        <id>yarn install in dox-sequence-diagram-ui</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
-                            </workingDirectory>
-                            <arguments>install</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>yarn build in dox-sequence-diagram-ui</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
-                            </workingDirectory>
-                             <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
-                            <arguments>build</arguments>
-                        </configuration>
-                    </execution>
+          <execution>
+            <id>yarn install in dox-sequence-diagram-ui</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
+              </workingDirectory>
+              <arguments>install</arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>yarn build in dox-sequence-diagram-ui</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
+              </workingDirectory>
+              <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+              <arguments>build</arguments>
+            </configuration>
+          </execution>
 
-                    <execution>
-                        <id>yarn install</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>install</arguments>
-                        </configuration>
-                    </execution>
+          <execution>
+            <id>yarn install</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <arguments>install</arguments>
+            </configuration>
+          </execution>
 
-                    <execution>
-                        <id>yarn build</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
-                            <arguments>build --version=${project.version} --env.version=${project.version} --env.language=en</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>ui test</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
-                            <arguments>test-build ${jest.command}</arguments>
-                            <skip>${skipTests}</skip>
-                        </configuration>
-                        <!-- for some reason does not fail on test phase -->
-                        <phase>test</phase>
-                    </execution>
-                </executions>
-            </plugin>
+          <execution>
+            <id>yarn build</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+              <arguments>build --version=${project.version} --env.version=${project.version} --env.language=en</arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>ui test</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+              <arguments>test-build ${jest.command}</arguments>
+              <skip>${skipTests}</skip>
+            </configuration>
+            <!-- for some reason does not fail on test phase -->
+            <phase>test</phase>
+          </execution>
+        </executions>
+      </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven.war.plugin.version}</version>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>${basedir}/dist</directory>
-                            <includes>
-                                <include>*.html</include>
-                                <include>*.js</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/src</directory>
-                            <includes>
-                                <include>**/*.json</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/external-resources/healthcheck/</directory>
-                            <targetPath>v1.0</targetPath>
-                            <filtering>true</filtering>
-                            <includes>
-                                <include>healthcheck</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/webapp-onboarding</directory>
-                            <filtering>true</filtering>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>${maven.war.plugin.version}</version>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>${basedir}/dist</directory>
+              <includes>
+                <include>*.html</include>
+                <include>*.js</include>
+              </includes>
+            </resource>
+            <resource>
+              <directory>${basedir}/src</directory>
+              <includes>
+                <include>**/*.json</include>
+              </includes>
+            </resource>
+            <resource>
+              <directory>${basedir}/external-resources/healthcheck/</directory>
+              <targetPath>v1.0</targetPath>
+              <filtering>true</filtering>
+              <includes>
+                <include>healthcheck</include>
+              </includes>
+            </resource>
+            <resource>
+              <directory>${basedir}/webapp-onboarding</directory>
+              <filtering>true</filtering>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/pom.xml b/pom.xml
index d121ecd470..e1071f703f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,607 +19,609 @@ limitations under the License.
 Modifications copyright (c) 2018-2019 Nokia
 ================================================================================
 -->
-<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>
-
-    <groupId>org.openecomp.sdc</groupId>
-    <artifactId>sdc-main</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>sdc</name>
-
-    <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-        <tosca.datatype.version>${project.version}</tosca.datatype.version>
-
-        <!-- 3rd parties versions -->
-        <bean-matcher.version>0.11</bean-matcher.version>
-        <lang3.version>3.3.2</lang3.version>
-        <lang3.version>3.3.2</lang3.version>
-        <guava.version>18.0</guava.version>
-        <janusgraph.version>0.3.1</janusgraph.version>
-        <spring.version>4.3.18.RELEASE</spring.version>
-        <spring.security.version>3.2.3.RELEASE</spring.security.version>
-        <spring.ldap.version>2.0.1.RELEASE</spring.ldap.version>
-        <jersey-bom.version>2.27</jersey-bom.version>
-        <netty.version>4.1.36.Final</netty.version>
-        <servlet-api.version>3.1.0</servlet-api.version>
-        <wire-mock.version>2.18.0</wire-mock.version>
-        <ecomp.version>2.4.0</ecomp.version>
-        <cassandra.unit.version>3.5.0.1</cassandra.unit.version>
-        <lombok.version>1.18.2</lombok.version>
-        <commons-beanutils>1.9.3</commons-beanutils>
-        <commons-configuration>2.3</commons-configuration>
-        <apache-poi.version>4.1.0</apache-poi.version>
-
-        <commons.collections.version>4.1</commons.collections.version>
-
-        <!-- Elastic Search mapper (reference the elastic search version actually). -->
-        <elastic-search.version>2.4.0</elastic-search.version>
-        <catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
-        <catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
-        <jetty.version>9.4.18.v20190429</jetty.version>
-
-        <!-- JSON and YAML Parsing -->
-        <jackson.version>2.9.9</jackson.version>
-        <jackson-annotations.version>2.9.9</jackson-annotations.version>
-        <jackson.mapper.version>1.9.13</jackson.mapper.version>
-
-        <!-- Yaml for properties -->
-        <snakeyaml.version>1.14</snakeyaml.version>
-        <functionaljava.version>4.7</functionaljava.version>
-        <httpclient.version>4.5.3</httpclient.version>
-        <httpcore.version>4.4.1</httpcore.version>
-        <json-simple.version>1.1</json-simple.version>
-
-        <!-- Logging start -->
-        <!-- logback -->
-        <logback.version>1.2.3</logback.version>
-        <slf4j-api.version>1.7.25</slf4j-api.version>
-        <commons-codec>1.10</commons-codec>
-        <commons-logging>1.2</commons-logging>
-        <janino.version>3.0.6</janino.version>
-
-        <!-- aspects -->
-        <jcabi.version>0.20.1</jcabi.version>
-        <aspectjrt.version>1.8.4</aspectjrt.version>
-        <aspectj.version>1.7.4</aspectj.version>
-        <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
-
-        <!-- Logging end -->
-        <!-- System Metrics -->
-        <sigar.version>1.6.4</sigar.version>
-
-        <regex.version>3.0.3</regex.version>
-
-        <!--GSON-->
-        <gson.version>2.3.1</gson.version>
-
-        <!--listen to file changes-->
-        <commons-jci-core.version>1.1</commons-jci-core.version>
-
-        <!--TESTING-->
-        <mockito.version>2.18.3</mockito.version>
-        <jmockit.version>1.33</jmockit.version>
-        <junit.version>4.12</junit.version>
-        <assertj.version>3.10.0</assertj.version>
-        <testng.version>6.14.3</testng.version>
-        <extentreports.version>3.0.3</extentreports.version>
-        <cucumber.version>2.4.0</cucumber.version>
-        <bean-matchers.version>0.11</bean-matchers.version>
-        <hamcrest.version>2.1</hamcrest.version>
-        <hamcrest-all.version>1.3</hamcrest-all.version>
-        <junit-jupiter.version>5.4.0</junit-jupiter.version>
-        <junit-vintage.version>5.4.0</junit-vintage.version>
-        <junit-platform.version>1.1.0</junit-platform.version>
-        <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
-        <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
-
-        <!-- parser-->
-        <sdc-tosca-parser.version>1.3.5</sdc-tosca-parser.version>
-
-        <!-- sonar -->
-        <sonar.language>java</sonar.language>
-        <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
-        <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
-        <sonar.branch>${project.version}</sonar.branch>
-
-        <!--cassandra -->
-        <cassandra.driver.version>3.0.0</cassandra.driver.version>
-        <libthrift.version>0.12.0</libthrift.version>
-        <!-- maven central (Nexus) -->
-        <nexus.id.release>nexus</nexus.id.release>
-        <nexus.id.snapshot>nexus</nexus.id.snapshot>
-
-        <!--nexus-->
-        <npm.registry>https://nexus3.onap.org/repository/npm.public/</npm.registry>
-        <nexus.proxy>https://nexus.onap.org</nexus.proxy>
-        <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
-        <staging.profile.id>176c31dfe190a</staging.profile.id>
-        <!--maven-->
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <!--docker tags-->
-        <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
-
-        <joda.time.version>2.9.9</joda.time.version>
-
-        <!--jacoco-->
-        <jacoco.version>0.8.1</jacoco.version>
-
-    </properties>
-
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.glassfish.jersey.ext</groupId>
-                <artifactId>jersey-bean-validation</artifactId>
-                <version>${jersey-bom.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.glassfish.hk2.external</groupId>
-                <artifactId>asm-all-repackaged</artifactId>
-                <version>2.4.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>${assertj.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
-            </dependency>
-            
-			<dependency>
-			<groupId>org.jmockit</groupId>
-				<artifactId>jmockit</artifactId>
-				<version>${jmockit.version}</version>
-			</dependency>
-			
-
-            <dependency>
-                <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock-standalone</artifactId>
-                <version>${wire-mock.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-java</artifactId>
-                <version>${cucumber.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-junit</artifactId>
-                <version>${cucumber.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${lang3.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy</artifactId>
-                <version>2.4.13</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-all</artifactId>
-                <version>${netty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
-                <version>${netty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.platform</groupId>
-                <artifactId>junit-platform-launcher</artifactId>
-                <version>${junit-platform.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit-jupiter.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <version>${junit-vintage.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
+<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>
+
+  <groupId>org.openecomp.sdc</groupId>
+  <artifactId>sdc-main</artifactId>
+  <version>1.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>sdc</name>
+
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>2.0.0</version>
+    <relativePath/>
+  </parent>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <tosca.datatype.version>${project.version}</tosca.datatype.version>
+
+    <!-- 3rd parties versions -->
+    <bean-matcher.version>0.11</bean-matcher.version>
+    <lang3.version>3.3.2</lang3.version>
+    <lang3.version>3.3.2</lang3.version>
+    <guava.version>18.0</guava.version>
+    <janusgraph.version>0.3.1</janusgraph.version>
+    <spring.version>4.3.18.RELEASE</spring.version>
+    <spring.security.version>3.2.3.RELEASE</spring.security.version>
+    <spring.ldap.version>2.0.1.RELEASE</spring.ldap.version>
+    <jersey-bom.version>2.27</jersey-bom.version>
+    <netty.version>4.1.36.Final</netty.version>
+    <servlet-api.version>3.1.0</servlet-api.version>
+    <wire-mock.version>2.18.0</wire-mock.version>
+    <ecomp.version>2.4.0</ecomp.version>
+    <cassandra.unit.version>3.5.0.1</cassandra.unit.version>
+    <lombok.version>1.18.2</lombok.version>
+    <commons-beanutils>1.9.3</commons-beanutils>
+    <commons-configuration>2.3</commons-configuration>
+    <apache-poi.version>4.1.0</apache-poi.version>
+
+    <commons.collections.version>4.1</commons.collections.version>
+
+    <!-- Elastic Search mapper (reference the elastic search version actually). -->
+    <elastic-search.version>2.4.0</elastic-search.version>
+    <catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
+    <catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
+    <jetty.version>9.4.18.v20190429</jetty.version>
+
+    <!-- JSON and YAML Parsing -->
+    <jackson.version>2.9.9</jackson.version>
+    <jackson-annotations.version>2.9.9</jackson-annotations.version>
+    <jackson.mapper.version>1.9.13</jackson.mapper.version>
+
+    <!-- Yaml for properties -->
+    <snakeyaml.version>1.14</snakeyaml.version>
+    <functionaljava.version>4.7</functionaljava.version>
+    <httpclient.version>4.5.3</httpclient.version>
+    <httpcore.version>4.4.1</httpcore.version>
+    <json-simple.version>1.1</json-simple.version>
+
+    <!-- Logging start -->
+    <!-- logback -->
+    <logback.version>1.2.3</logback.version>
+    <slf4j-api.version>1.7.25</slf4j-api.version>
+    <commons-codec>1.10</commons-codec>
+    <commons-logging>1.2</commons-logging>
+    <janino.version>3.0.6</janino.version>
+
+    <!-- aspects -->
+    <jcabi.version>0.20.1</jcabi.version>
+    <aspectjrt.version>1.8.4</aspectjrt.version>
+    <aspectj.version>1.7.4</aspectj.version>
+    <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
+
+    <!-- Logging end -->
+    <!-- System Metrics -->
+    <sigar.version>1.6.4</sigar.version>
+
+    <regex.version>3.0.3</regex.version>
+
+    <!--GSON-->
+    <gson.version>2.3.1</gson.version>
+
+    <!--listen to file changes-->
+    <commons-jci-core.version>1.1</commons-jci-core.version>
+
+    <!--TESTING-->
+    <mockito.version>2.18.3</mockito.version>
+    <jmockit.version>1.33</jmockit.version>
+    <junit.version>4.12</junit.version>
+    <assertj.version>3.10.0</assertj.version>
+    <testng.version>6.14.3</testng.version>
+    <extentreports.version>3.0.3</extentreports.version>
+    <cucumber.version>2.4.0</cucumber.version>
+    <bean-matchers.version>0.11</bean-matchers.version>
+    <hamcrest.version>2.1</hamcrest.version>
+    <hamcrest-all.version>1.3</hamcrest-all.version>
+    <junit-jupiter.version>5.4.0</junit-jupiter.version>
+    <junit-vintage.version>5.4.0</junit-vintage.version>
+    <junit-platform.version>1.1.0</junit-platform.version>
+    <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+    <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
+
+    <!-- parser-->
+    <sdc-tosca-parser.version>1.3.5</sdc-tosca-parser.version>
+
+    <!-- sonar -->
+    <sonar.language>java</sonar.language>
+    <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
+    <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+    <sonar.branch>${project.version}</sonar.branch>
+
+    <!--cassandra -->
+    <cassandra.driver.version>3.0.0</cassandra.driver.version>
+    <libthrift.version>0.12.0</libthrift.version>
+    <!-- maven central (Nexus) -->
+    <nexus.id.release>nexus</nexus.id.release>
+    <nexus.id.snapshot>nexus</nexus.id.snapshot>
+
+    <!--nexus-->
+    <npm.registry>https://nexus3.onap.org/repository/npm.public/</npm.registry>
+    <nexus.proxy>https://nexus.onap.org</nexus.proxy>
+    <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
+    <staging.profile.id>176c31dfe190a</staging.profile.id>
+    <!--maven-->
+    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+    <!--docker tags-->
+    <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
+
+    <joda.time.version>2.9.9</joda.time.version>
+
+    <!--jacoco-->
+    <jacoco.version>0.8.1</jacoco.version>
+
+  </properties>
+
+
+  <dependencyManagement>
     <dependencies>
-        <dependency>
-            <!-- must be on the classpath -->
-            <groupId>org.jacoco</groupId>
-            <artifactId>org.jacoco.agent</artifactId>
-            <classifier>runtime</classifier>
-            <version>${jacoco.version}</version>
-            <scope>test</scope>
-        </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.glassfish.jersey.ext</groupId>
+        <artifactId>jersey-bean-validation</artifactId>
+        <version>${jersey-bom.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.glassfish.hk2.external</groupId>
+        <artifactId>asm-all-repackaged</artifactId>
+        <version>2.4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>${assertj.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>${mockito.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jmockit</groupId>
+        <artifactId>jmockit</artifactId>
+        <version>${jmockit.version}</version>
+      </dependency>
+
+
+      <dependency>
+        <groupId>com.github.tomakehurst</groupId>
+        <artifactId>wiremock-standalone</artifactId>
+        <version>${wire-mock.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.cucumber</groupId>
+        <artifactId>cucumber-java</artifactId>
+        <version>${cucumber.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.cucumber</groupId>
+        <artifactId>cucumber-junit</artifactId>
+        <version>${cucumber.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${lang3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy</artifactId>
+        <version>2.4.13</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-all</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-handler</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-launcher</artifactId>
+        <version>${junit-platform.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit-jupiter.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+        <version>${junit-vintage.version}</version>
+      </dependency>
     </dependencies>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-                    <docletArtifact>
-                        <groupId>org.umlgraph</groupId>
-                        <artifactId>umlgraph</artifactId>
-                        <version>5.6</version>
-                    </docletArtifact>
-                    <useStandardDocletOptions>true</useStandardDocletOptions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.1.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.6.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.4.1.1168</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>ru.yaal.maven</groupId>
-                    <artifactId>write-text-files-maven-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>1.5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.1.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.26.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>3.2.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.eirslett</groupId>
-                    <artifactId>frontend-maven-plugin</artifactId>
-                    <version>1.6</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.sylvainlaurent.maven</groupId>
-                    <artifactId>yaml-json-validator-maven-plugin</artifactId>
-                    <version>1.0.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>pl.project13.maven</groupId>
-                    <artifactId>git-commit-id-plugin</artifactId>
-                    <version>2.2.6</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <configuration>
-                    <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-                </configuration>
-            </plugin>
-            <!-- plugin for parsing the project version -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>parse-version</id>
-                        <phase>pre-clean</phase>
-                        <goals>
-                            <goal>parse-version</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Java Code Coverage -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>default-instrument</id>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-restore-instrumented-classes</id>
-                        <goals>
-                            <goal>restore-instrumented-classes</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.7.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.wagon</groupId>
-                        <artifactId>wagon-webdav-jackrabbit</artifactId>
-                        <version>3.0.0</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <!-- Set the deployment repositories properties. -->
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <inherited>false</inherited>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                pom.properties['deploy.url'] =
-                                pom.version.contains('-SNAPSHOT') ?
-                                project.distributionManagement.snapshotRepository.url :
-                                project.distributionManagement.repository.url;
-                                pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
-                                project.distributionManagement.snapshotRepository.id :
-                                project.distributionManagement.repository.id;
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <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>
-                <configuration>
-                    <printSummary>false</printSummary>
-                    <systemPropertyVariables>
-                        <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-               <groupId>pl.project13.maven</groupId>
-               <artifactId>git-commit-id-plugin</artifactId>
-               <executions>
-                  <execution>
-                     <goals>
-                        <goal>revision</goal>
-                     </goals>
-                  </execution>
-               </executions>
-               <configuration>
-                  <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                  <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties</generateGitPropertiesFilename>
-                  <failOnNoGitDirectory>true</failOnNoGitDirectory>
-                  <verbose>false</verbose>
-                  <includeOnlyProperties>
-                     <includeOnlyProperty>git.build.version</includeOnlyProperty>
-                     <includeOnlyProperty>git.build.time</includeOnlyProperty>
-                     <includeOnlyProperty>git.commit.id</includeOnlyProperty>
-                     <includeOnlyProperty>git.commit.time</includeOnlyProperty>
-                     <includeOnlyProperty>git.commit.user.name</includeOnlyProperty>
-                     <includeOnlyProperty>git.commit.user.email</includeOnlyProperty>
-                     <includeOnlyProperty>git.commit.message.short</includeOnlyProperty>
-                     <includeOnlyProperty>git.commit.message.full</includeOnlyProperty>
-                  </includeOnlyProperties>
-                  <gitDescribe>
-                     <skip>true</skip>
-                  </gitDescribe>
-                  <useNativeGit>false</useNativeGit>
-               </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>all</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>onboarding</module>
-                <module>security-utils</module>
-                <module>common-app-api</module>
-                <module>common-be</module>
-                <module>catalog-dao</module>
-                <module>catalog-model</module>
-                <module>catalog-be</module>
-                <module>asdctool</module>
-                <module>catalog-ui</module>
-                <module>catalog-fe</module>
-                <module>test-apis-ci</module>
-                <module>ui-ci</module>
-                <module>sdc-os-chef</module>
-                <module>utils/webseal-simulator</module>
-            </modules>
-
-        </profile>
-
-        <profile>
-            <id>catalog</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <modules>
-                <module>security-utils</module>
-                <module>common-app-api</module>
-                <module>common-be</module>
-                <module>catalog-dao</module>
-                <module>catalog-model</module>
-                <module>catalog-be</module>
-                <module>asdctool</module>
-                <module>catalog-ui</module>
-                <module>catalog-fe</module>
-                <module>test-apis-ci</module>
-                <module>ui-ci</module>
-            </modules>
-
-            <properties>
-                <sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>onboarding</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <modules>
-                <module>onboarding</module>
-            </modules>
-        </profile>
-
-    </profiles>
-
-    <repositories>
-        <!-- LF repositories -->
-        <repository>
-            <id>ecomp-releases</id>
-            <name>Release Repository</name>
-            <url>${nexus.proxy}/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>ecomp-snapshots</id>
-            <name>Snapshots Repository</name>
-            <url>${nexus.proxy}/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>ecomp-public</id>
-            <name>Public Repository</name>
-            <url>${nexus.proxy}/content/repositories/public/</url>
-        </repository>
-        <!-- LF repositories END-->
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>Release Repository</name>
-            <url>${nexus.proxy}/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>Snapshot Repository</name>
-            <url>${nexus.proxy}/content/repositories/snapshots/</url>
-        </snapshotRepository>
-        <site>
-            <id>ecomp-site</id>
-            <url>dav:${nexus.proxy}${sitePath}</url>
-        </site>
-    </distributionManagement>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <!-- must be on the classpath -->
+      <groupId>org.jacoco</groupId>
+      <artifactId>org.jacoco.agent</artifactId>
+      <classifier>runtime</classifier>
+      <version>${jacoco.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.0.1</version>
+        <configuration>
+          <failOnError>false</failOnError>
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletArtifact>
+            <groupId>org.umlgraph</groupId>
+            <artifactId>umlgraph</artifactId>
+            <version>5.6</version>
+          </docletArtifact>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.8.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.6.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>3.4.1.1168</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>ru.yaal.maven</groupId>
+          <artifactId>write-text-files-maven-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.gmaven</groupId>
+          <artifactId>gmaven-plugin</artifactId>
+          <version>1.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>io.fabric8</groupId>
+          <artifactId>docker-maven-plugin</artifactId>
+          <version>0.26.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>com.github.eirslett</groupId>
+          <artifactId>frontend-maven-plugin</artifactId>
+          <version>1.8.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${maven-surefire-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <groupId>com.github.sylvainlaurent.maven</groupId>
+          <artifactId>yaml-json-validator-maven-plugin</artifactId>
+          <version>1.0.1</version>
+        </plugin>
+        <plugin>
+          <groupId>pl.project13.maven</groupId>
+          <artifactId>git-commit-id-plugin</artifactId>
+          <version>2.2.6</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <configuration>
+          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+          <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+        </configuration>
+      </plugin>
+      <!-- plugin for parsing the project version -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>parse-version</id>
+            <phase>pre-clean</phase>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Java Code Coverage -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <id>default-instrument</id>
+            <goals>
+              <goal>instrument</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-restore-instrumented-classes</id>
+            <goals>
+              <goal>restore-instrumented-classes</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-report</id>
+            <goals>
+              <goal>report</goal>
+            </goals>
+            <configuration>
+              <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.7.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav-jackrabbit</artifactId>
+            <version>3.0.0</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+      <!-- Set the deployment repositories properties. -->
+      <plugin>
+        <groupId>org.codehaus.gmaven</groupId>
+        <artifactId>gmaven-plugin</artifactId>
+        <executions>
+          <execution>
+            <inherited>false</inherited>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>
+                pom.properties['deploy.url'] =
+                  pom.version.contains('-SNAPSHOT') ?
+                    project.distributionManagement.snapshotRepository.url :
+                    project.distributionManagement.repository.url;
+                pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
+                  project.distributionManagement.snapshotRepository.id :
+                  project.distributionManagement.repository.id;
+              </source>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <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>
+        <configuration>
+          <printSummary>false</printSummary>
+          <systemPropertyVariables>
+            <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties
+          </generateGitPropertiesFilename>
+          <failOnNoGitDirectory>true</failOnNoGitDirectory>
+          <verbose>false</verbose>
+          <includeOnlyProperties>
+            <includeOnlyProperty>git.build.version</includeOnlyProperty>
+            <includeOnlyProperty>git.build.time</includeOnlyProperty>
+            <includeOnlyProperty>git.commit.id</includeOnlyProperty>
+            <includeOnlyProperty>git.commit.time</includeOnlyProperty>
+            <includeOnlyProperty>git.commit.user.name</includeOnlyProperty>
+            <includeOnlyProperty>git.commit.user.email</includeOnlyProperty>
+            <includeOnlyProperty>git.commit.message.short</includeOnlyProperty>
+            <includeOnlyProperty>git.commit.message.full</includeOnlyProperty>
+          </includeOnlyProperties>
+          <gitDescribe>
+            <skip>true</skip>
+          </gitDescribe>
+          <useNativeGit>false</useNativeGit>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>all</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>onboarding</module>
+        <module>security-utils</module>
+        <module>common-app-api</module>
+        <module>common-be</module>
+        <module>catalog-dao</module>
+        <module>catalog-model</module>
+        <module>catalog-be</module>
+        <module>asdctool</module>
+        <module>catalog-ui</module>
+        <module>catalog-fe</module>
+        <module>test-apis-ci</module>
+        <module>ui-ci</module>
+        <module>sdc-os-chef</module>
+        <module>utils/webseal-simulator</module>
+      </modules>
+
+    </profile>
+
+    <profile>
+      <id>catalog</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <modules>
+        <module>security-utils</module>
+        <module>common-app-api</module>
+        <module>common-be</module>
+        <module>catalog-dao</module>
+        <module>catalog-model</module>
+        <module>catalog-be</module>
+        <module>asdctool</module>
+        <module>catalog-ui</module>
+        <module>catalog-fe</module>
+        <module>test-apis-ci</module>
+        <module>ui-ci</module>
+      </modules>
+
+      <properties>
+        <sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>onboarding</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <modules>
+        <module>onboarding</module>
+      </modules>
+    </profile>
+
+  </profiles>
+
+  <repositories>
+    <!-- LF repositories -->
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/releases/</url>
+    </repository>
+    <repository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshots Repository</name>
+      <url>${nexus.proxy}/content/repositories/snapshots/</url>
+    </repository>
+    <repository>
+      <id>ecomp-public</id>
+      <name>Public Repository</name>
+      <url>${nexus.proxy}/content/repositories/public/</url>
+    </repository>
+    <!-- LF repositories END-->
+  </repositories>
+
+  <distributionManagement>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshot Repository</name>
+      <url>${nexus.proxy}/content/repositories/snapshots/</url>
+    </snapshotRepository>
+    <site>
+      <id>ecomp-site</id>
+      <url>dav:${nexus.proxy}${sitePath}</url>
+    </site>
+  </distributionManagement>
 </project>