pom.xml cleanup

Change-Id: I7622437fbd6d4d4a0b09782c8a6fa2d6016f90ab
Issue-ID: VID-368
Signed-off-by: biniek <lukasz.biniek@nokia.com>

6 files changed, 1379 insertions, 1469 deletions

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index f096c2b62..48b588ec5 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -1,106 +1,104 @@
 <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>

+         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.onap.vid</groupId>

-		<artifactId>vid-parent</artifactId>

-		<version>4.0.0-SNAPSHOT</version>

-	</parent>

+    <parent>

+        <groupId>org.onap.vid</groupId>

+        <artifactId>vid-parent</artifactId>

+        <version>4.0.0-SNAPSHOT</version>

+    </parent>

 

-	<packaging>pom</packaging>

-	<groupId>org.onap.vid</groupId>

-	<artifactId>vid-deliveries</artifactId>

+    <packaging>pom</packaging>

+    <artifactId>vid-deliveries</artifactId>

 

-	<name>VID Deliveries</name>

-	<description>ONAP VID Deliveries</description>

-	<properties>

-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-		<docker.push.registry>${docker_registry}</docker.push.registry>

-		<docker.verbose>true</docker.verbose>

-	</properties>

+    <name>VID Deliveries</name>

+    <description>ONAP VID Deliveries</description>

+    <properties>

+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

+        <docker.push.registry>${docker_registry}</docker.push.registry>

+        <docker.verbose>true</docker.verbose>

+    </properties>

 

-	<profiles>

+    <profiles>

 

-		<profile>

-			<id>docker-proxy</id>

-			<!-- activate profile if environment variable `http_proxy` is set -->

-			<activation>

-				<property>

-					<name>env.http_proxy</name>

-				</property>

-			</activation>

-			<properties>

-				<docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>

-			</properties>

-		</profile>

+        <profile>

+            <id>docker-proxy</id>

+            <!-- activate profile if environment variable `http_proxy` is set -->

+            <activation>

+                <property>

+                    <name>env.http_proxy</name>

+                </property>

+            </activation>

+            <properties>

+                <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>

+            </properties>

+        </profile>

 

-	</profiles>

+    </profiles>

 

-	<build>

-		<finalName>${project.artifactId}-${project.version}</finalName>

-		<plugins>

-			<plugin>

-				<groupId>io.fabric8</groupId>

-				<artifactId>docker-maven-plugin</artifactId>

-				<version>0.16.5</version>

+    <build>

+        <finalName>${project.artifactId}-${project.version}</finalName>

+        <plugins>

+            <plugin>

+                <groupId>io.fabric8</groupId>

+                <artifactId>docker-maven-plugin</artifactId>

+                <version>0.16.5</version>

 

-				<configuration>

-					<verbose>true</verbose>

+                <configuration>

+                    <verbose>true</verbose>

+                    <apiVersion>1.23</apiVersion>

+                    <images>

+                        <image>

+                            <name>onap/vid:${project.version}</name>

+                            <build>

+                                <cleanup>remove</cleanup>

+                                <dockerFileDir>docker-files</dockerFileDir>

+                                <assembly>

+                                    <basedir>/</basedir>

+                                    <user>vidadmin:vidadmin:vidadmin</user>

+                                    <descriptor>assembly/assembly-for-plugin.xml</descriptor>

+                                </assembly>

+                                <tags>

+                                    <tag>4.0-STAGING-latest</tag>

+                                    <tag>latest</tag>

+                                </tags>

 

-					<apiVersion>1.23</apiVersion>

-					<images>

-						<image>

-							<name>onap/vid:${project.version}</name>

-							<build>

-								<cleanup>remove</cleanup>

-								<dockerFileDir>docker-files</dockerFileDir>

-								<assembly>

-									<basedir>/</basedir>

-									<user>vidadmin:vidadmin:vidadmin</user>

-									<descriptor>assembly/assembly-for-plugin.xml</descriptor>

-								</assembly>

-								<tags>

-								  <tag>4.0-STAGING-latest</tag>

-								  <tag>latest</tag>

-								</tags>

-								    

-							</build>

-						</image>

-					</images>

-				</configuration>

+                            </build>

+                        </image>

+                    </images>

+                </configuration>

 

-				<executions>

-					<execution>

-						<id>generate-image</id>

-						<phase>package</phase>

-						<goals>

-							<goal>build</goal>

-						</goals>

-					</execution>

-					

-					<execution>

-						<id>push-image</id>

-						<phase>deploy</phase>

-						<goals>

-							<goal>build</goal>

-							<goal>push</goal>

-						</goals>

-					</execution>

-				</executions>

+                <executions>

+                    <execution>

+                        <id>generate-image</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>build</goal>

+                        </goals>

+                    </execution>

 

-			</plugin>

+                    <execution>

+                        <id>push-image</id>

+                        <phase>deploy</phase>

+                        <goals>

+                            <goal>build</goal>

+                            <goal>push</goal>

+                        </goals>

+                    </execution>

+                </executions>

 

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-deploy-plugin</artifactId>

-				<version>2.8</version>

-				<configuration>

-					<skip>true</skip>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-deploy-plugin</artifactId>

+                <version>2.8</version>

+                <configuration>

+                    <skip>true</skip>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

 

 </project>

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index b46c0fe81..fec6d0cc1 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -1,478 +1,453 @@
-<?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">

-	<modelVersion>4.0.0</modelVersion>

-

-	<!-- This is the Maven project object model (POM) file for the open-source 

-		SDK web app. This is NOT the Portal - but it is developed and supported by 

-		the Portal team. -->

-	<groupId>org.onap.vid</groupId>

-	<artifactId>epsdk-app-onap</artifactId>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>war</packaging>

-	<name>ECOMP SDK Webapp for OpenSource</name>

-	<description>ECOMP SDK Web Application for public release</description>

-

-	<properties>

-		<encoding>UTF-8</encoding>

-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-		<epsdk.version>2.4.0</epsdk.version>

-		<springframework.version>4.2.9.RELEASE</springframework.version>

-		<hibernate.version>4.3.11.Final</hibernate.version>

-		<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->

-		<skipassembly>true</skipassembly>

-		<!-- Tests usually require some setup that maven cannot do, so skip. -->

-		<skiptests>false</skiptests>

-		<nexusproxy>https://nexus.onap.org</nexusproxy>

-		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>

-		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>

-		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>

-		<sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>

-

-		<!-- SONAR -->

-		<sonar.language>java</sonar.language>

-		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

-		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>

-		<sonar.projectVersion>${project.version}</sonar.projectVersion>

-	</properties>

-

-	<repositories>

-		<repository>

-			<id>ecomp-releases</id>

-			<name>VID Release Repository</name>

-			<url>${nexusproxy}${releaseNexusPath}</url>

-		</repository>

-		<repository>

-			<id>ecomp-snapshots</id>

-			<name>VID Snapshot Repository</name>

-			<url>${nexusproxy}${snapshotNexusPath}</url>

-		</repository>

-		<repository>

-			<id>ecomp-staging</id>

-			<name>VID Staging Repository</name>

-			<url>${nexusproxy}${stagingNexusPath}</url>

-		</repository>

-		<repository>

-			<!-- Snapshots repository has ECOMP snapshot artifacts -->

-			<id>oss-snapshots</id>

-			<name>oss Central - Snapshots</name>

-			<url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>

-		</repository>

-	</repositories>

-	<distributionManagement>

-		<repository>

-			<id>ecomp-releases</id>

-			<name>VID Release Repository</name>

-			<url>${nexusproxy}/${releaseNexusPath}</url>

-		</repository>

-		<snapshotRepository>

-			<id>ecomp-snapshots</id>

-			<name>VID Snapshot Repository</name>

-			<url>${nexusproxy}/${snapshotNexusPath}</url>

-		</snapshotRepository>

-		<!-- added for javadoc -->

-		<site>

-			<id>ecomp-site</id>

-			<url>dav:${nexusproxy}${sitePath}</url>

-		</site>

-	</distributionManagement>

-

-	<profiles>

-		<!-- disable doclint, a new feature in Java 8, when generating javadoc -->

-		<profile>

-			<id>doclint-java8-disable</id>

-			<activation>

-				<jdk>[1.8,)</jdk>

-			</activation>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>org.apache.maven.plugins</groupId>

-						<artifactId>maven-javadoc-plugin</artifactId>

-						<version>2.10.4</version>

-						<configuration>

-							<additionalparam>-Xdoclint:none</additionalparam>

-						</configuration>

-					</plugin>

-				</plugins>

-			</build>

-		</profile>

-	</profiles>

-

-	<build>

-		<finalName>vid</finalName>

-		<plugins>

-			<plugin>

-				<groupId>org.sonatype.plugins</groupId>

-				<artifactId>nexus-staging-maven-plugin</artifactId>

-				<version>1.6.7</version>

-				<extensions>true</extensions>

-				<configuration>

-					<nexusUrl>${nexusproxy}</nexusUrl>

-					<stagingProfileId>176c31dfe190a</stagingProfileId>

-					<serverId>ecomp-staging</serverId>

-				</configuration>

-			</plugin>

-

-			<!-- Compile to Java 1.8 class output format -->

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-compiler-plugin</artifactId>

-				<version>3.1</version>

-				<configuration>

-					<source>1.8</source>

-					<target>1.8</target>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-surefire-plugin</artifactId>

-				<version>2.19.1</version>

-				<configuration>

-					<skipTests>${skiptests}</skipTests>

-					<includes>

-						<include>**/Test*.java</include>

-						<include>**/*Test.java</include>

-						<include>**/*TestCase.java</include>

-					</includes>

-					<additionalClasspathElements>

-						<additionalClasspathElement>${basedir}/war</additionalClasspathElement>

-					</additionalClasspathElements>

-					<systemPropertyVariables>

-						<container.classpath>classpath:</container.classpath>

-					</systemPropertyVariables>

-					<useSystemClassLoader>false</useSystemClassLoader>

-				</configuration>

-			</plugin>

-

-			<!-- add version number to manifest -->

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-war-plugin</artifactId>

-				<version>2.0.2</version>

-				<configuration>

-					<archive>

-						<manifest>

-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>

-						</manifest>

-						<manifestEntries>

-							<Build-Number>${project.version}</Build-Number>

-							<Build-Time>${maven.build.timestamp}</Build-Time>

-						</manifestEntries>

-					</archive>

-					<overlays>

-						<overlay>

-							<groupId>org.onap.vid</groupId>

-							<artifactId>vid-app-common</artifactId>

-						</overlay>

-						<overlay>

-							<groupId>org.onap.portal.sdk</groupId>

-							<artifactId>epsdk-app-overlay</artifactId>

-						</overlay>

-					</overlays>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-assembly-plugin</artifactId>

-				<version>3.0.0</version>

-				<configuration>

-					<skipAssembly>${skipassembly}</skipAssembly>

-					<descriptors>

-						<descriptor>${basedir}/distribution.xml</descriptor>

-					</descriptors>

-				</configuration>

-				<executions>

-					<execution>

-						<id>make-assembly</id>

-						<phase>package</phase>

-						<goals>

-							<goal>single</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-site-plugin</artifactId>

-				<version>3.6</version>

-				<dependencies>

-					<dependency>

-						<groupId>org.apache.maven.wagon</groupId>

-						<artifactId>wagon-webdav-jackrabbit</artifactId>

-						<version>2.10</version>

-					</dependency>

-				</dependencies>

-			</plugin>

-

-			<plugin>

-				<artifactId>maven-surefire-plugin</artifactId>

-				<version>2.17</version>

-				<configuration>

-				    <useSystemClassLoader>false</useSystemClassLoader>

-			        </configuration>

-			</plugin>

-			<plugin>

-				<groupId>org.sonarsource.scanner.maven</groupId>

-				<artifactId>sonar-maven-plugin</artifactId>

-				<version>3.3.0.603</version>

-			</plugin>

-			<plugin>

-				<groupId>org.jacoco</groupId>

-				<artifactId>jacoco-maven-plugin</artifactId>

-				<version>0.7.9</version>

-				<executions>

-					<execution>

-						<id>default-prepare-agent</id>

-						<goals>

-							<goal>prepare-agent</goal>

-						</goals>

-					</execution>

-					<execution>

-						<id>default-report</id>

-						<goals>

-							<goal>report</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-

-		</plugins>

-	</build>

-

-	<reporting>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-javadoc-plugin</artifactId>

-				<version>2.10.4</version>

-				<configuration>

-					<failOnError>false</failOnError>

-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>

-					<docletArtifact>

-						<groupId>org.umlgraph</groupId>

-						<artifactId>umlgraph</artifactId>

-						<version>5.6</version>

-					</docletArtifact>

-					<additionalparam>-views</additionalparam>

-					<useStandardDocletOptions>true</useStandardDocletOptions>

-				</configuration>

-			</plugin>

-		</plugins>

-	</reporting>

-	<dependencies>

-		<!-- SDK overlay war -->

-		<dependency>

-			<groupId>org.onap.portal.sdk</groupId>

-			<artifactId>epsdk-app-overlay</artifactId>

-			<version>${epsdk.version}</version>

-			<type>war</type>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.portal.sdk</groupId>

-			<artifactId>epsdk-app-common</artifactId>

-			<version>${epsdk.version}</version>

-			<type>jar</type>

-			<exclusions>

-				<exclusion>

-					<groupId>com.fasterxml.jackson.core</groupId>

-					<artifactId>jackson-core</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.vid</groupId>

-			<artifactId>vid-app-common</artifactId>

-			<version>${project.version}</version>

-			<type>war</type>

-			<exclusions>

-				<exclusion>

-					<groupId>com.fasterxml.jackson.core</groupId>

-					<artifactId>jackson-core</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.vid</groupId>

-			<artifactId>vid-app-common</artifactId>

-			<version>${project.version}</version>

-			<type>jar</type>

-			<classifier>classes</classifier>

-		</dependency>

-		<!-- SDK components -->

-		<dependency>

-			<groupId>org.onap.portal.sdk</groupId>

-			<artifactId>epsdk-core</artifactId>

-			<version>${epsdk.version}</version>

-			<exclusions>

-				<exclusion>

-					<groupId>com.fasterxml.jackson.core</groupId>

-					<artifactId>jackson-core</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.portal.sdk</groupId>

-			<artifactId>epsdk-analytics</artifactId>

-			<version>${epsdk.version}</version>

-			<exclusions>

-				<exclusion>

-					<groupId>com.fasterxml.jackson.core</groupId>

-					<artifactId>jackson-core</artifactId>

-				</exclusion>

-				<exclusion>

-					<groupId>com.lowagie</groupId>

-					<artifactId>itext</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.portal.sdk</groupId>

-			<artifactId>epsdk-workflow</artifactId>

-			<version>${epsdk.version}</version>

-			<exclusions>

-				<exclusion>

-					<groupId>com.fasterxml.jackson.core</groupId>

-					<artifactId>jackson-core</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>com.att.eelf</groupId>

-			<artifactId>eelf-core</artifactId>

-			<version>1.0.0</version>

-		</dependency>

-		

-

-

-

-		<dependency>

-			<groupId>org.onap.vid</groupId>

-			<artifactId>vid-app-common</artifactId>

-			<version>${version}</version>

-			<type>war</type>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.vid</groupId>

-			<artifactId>vid-app-common</artifactId>

-			<version>${version}</version>

-			<type>jar</type>

-			<classifier>classes</classifier>

-		</dependency>

-		<!-- Mapper -->

-		<dependency>

-			<groupId>com.fasterxml.jackson.core</groupId>

-			<artifactId>jackson-annotations</artifactId>

-			<version>2.6.3</version>

-		</dependency>

-		<dependency>

-			<groupId>com.fasterxml.jackson.core</groupId>

-			<artifactId>jackson-core</artifactId>

-			<version>2.8.6</version>

-		</dependency>

-		<dependency>

-			<groupId>com.fasterxml.jackson.core</groupId>

-			<artifactId>jackson-databind</artifactId>

-			<version>2.6.7.1</version>

-			<exclusions>

-				<exclusion>

-					<groupId>com.fasterxml.jackson.core</groupId>

-					<artifactId>jackson-core</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>com.mchange</groupId>

-			<artifactId>c3p0</artifactId>

-			<version>0.9.5.2</version>

-		</dependency>

-		<dependency>

-			<groupId>io.searchbox</groupId>

-			<artifactId>jest</artifactId>

-			<version>2.0.0</version>

-			<exclusions>

-				<exclusion>

-					<groupId>commons-logging</groupId>

-					<artifactId>commons-logging</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>javax.servlet</groupId>

-			<artifactId>javax.servlet-api</artifactId>

-			<version>3.1.0</version>

-		</dependency>

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>4.12</version>

-		</dependency>

-		<dependency>

-			<groupId>org.json</groupId>

-			<artifactId>json</artifactId>

-			<version>20160212</version>

-		</dependency>

-		<dependency>

-			<groupId>org.quartz-scheduler</groupId>

-			<artifactId>quartz</artifactId>

-			<version>2.2.1</version>

-			<exclusions>

-				<!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->

-				<exclusion>

-					<groupId>c3p0</groupId>

-					<artifactId>c3p0</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<!-- bridge to implement commons-logging using slf4j -->

-		<dependency>

-			<groupId>org.slf4j</groupId>

-			<artifactId>jcl-over-slf4j</artifactId>

-			<version>1.7.12</version>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-context-support</artifactId>

-			<version>${springframework.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-core</artifactId>

-			<version>${springframework.version}</version>

-			<exclusions>

-				<exclusion>

-					<groupId>commons-logging</groupId>

-					<artifactId>commons-logging</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-aop</artifactId>

-			<version>${springframework.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-test</artifactId>

-			<version>${springframework.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-tx</artifactId>

-			<version>${springframework.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-web</artifactId>

-			<version>${springframework.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework</groupId>

-			<artifactId>spring-webmvc</artifactId>

-			<version>${springframework.version}</version>

-		</dependency>

-	</dependencies>

-</project>

+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- This is the Maven project object model (POM) file for the open-source
+        SDK web app. This is NOT the Portal - but it is developed and supported by
+        the Portal team. -->
+    <groupId>org.onap.vid</groupId>
+    <artifactId>epsdk-app-onap</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+    <name>ECOMP SDK Webapp for OpenSource</name>
+    <description>ECOMP SDK Web Application for public release</description>
+
+    <properties>
+        <encoding>UTF-8</encoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <epsdk.version>2.4.0</epsdk.version>
+        <springframework.version>4.2.9.RELEASE</springframework.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
+        <skipassembly>true</skipassembly>
+        <!-- Tests usually require some setup that maven cannot do, so skip. -->
+        <skiptests>false</skiptests>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+        <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
+
+        <!-- SONAR -->
+        <sonar.language>java</sonar.language>
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>VID Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <repository>
+            <id>ecomp-snapshots</id>
+            <name>VID Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </repository>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>VID Staging Repository</name>
+            <url>${nexusproxy}${stagingNexusPath}</url>
+        </repository>
+        <repository>
+            <!-- Snapshots repository has ECOMP snapshot artifacts -->
+            <id>oss-snapshots</id>
+            <name>oss Central - Snapshots</name>
+            <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>
+        </repository>
+    </repositories>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>VID Release Repository</name>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>VID Snapshot Repository</name>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <!-- added for javadoc -->
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
+
+    <profiles>
+        <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <finalName>vid</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <nexusUrl>${nexusproxy}</nexusUrl>
+                    <stagingProfileId>176c31dfe190a</stagingProfileId>
+                    <serverId>ecomp-staging</serverId>
+                </configuration>
+            </plugin>
+
+            <!-- Compile to Java 1.8 class output format -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <skipTests>${skiptests}</skipTests>
+                    <includes>
+                        <include>**/Test*.java</include>
+                        <include>**/*Test.java</include>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <additionalClasspathElements>
+                        <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
+                    </additionalClasspathElements>
+                    <systemPropertyVariables>
+                        <container.classpath>classpath:</container.classpath>
+                    </systemPropertyVariables>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
+
+            <!-- add version number to manifest -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                        <manifestEntries>
+                            <Build-Number>${project.version}</Build-Number>
+                            <Build-Time>${maven.build.timestamp}</Build-Time>
+                        </manifestEntries>
+                    </archive>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.onap.vid</groupId>
+                            <artifactId>vid-app-common</artifactId>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.onap.portal.sdk</groupId>
+                            <artifactId>epsdk-app-overlay</artifactId>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <skipAssembly>${skipassembly}</skipAssembly>
+                    <descriptors>
+                        <descriptor>${basedir}/distribution.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.6</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-webdav-jackrabbit</artifactId>
+                        <version>2.10</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.3.0.603</version>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.9</version>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-report</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views</additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+    <dependencies>
+        <!-- SDK overlay war -->
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-app-overlay</artifactId>
+            <version>${epsdk.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-app-common</artifactId>
+            <version>${epsdk.version}</version>
+            <type>jar</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.vid</groupId>
+            <artifactId>vid-app-common</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.vid</groupId>
+            <artifactId>vid-app-common</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+            <classifier>classes</classifier>
+        </dependency>
+        <!-- SDK components -->
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-core</artifactId>
+            <version>${epsdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-analytics</artifactId>
+            <version>${epsdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.lowagie</groupId>
+                    <artifactId>itext</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-workflow</artifactId>
+            <version>${epsdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.att.eelf</groupId>
+            <artifactId>eelf-core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <!-- Mapper -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.6.7.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.9.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.searchbox</groupId>
+            <artifactId>jest</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160212</version>
+        </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <version>2.2.1</version>
+            <exclusions>
+                <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
+                <exclusion>
+                    <groupId>c3p0</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- bridge to implement commons-logging using slf4j -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index de4b76607..70a7ac74e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,275 +1,249 @@
 <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.onap.vid</groupId>

-	<artifactId>vid-parent</artifactId>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>pom</packaging>

-	<name>vid</name>

-

-	<profiles>

-		<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->

-

-		<profile>

-			<id>onap</id>

-			<activation>

-				<activeByDefault>true</activeByDefault>

-			</activation>

-			<modules>

-				<module>vid-app-common</module>

-				<module>vid-webpack-master</module>

-				<module>epsdk-app-onap</module>

-				<!--module>vid-automation</module-->

-				<!--module>vid-ext-services-simulator</module-->

-			</modules>

-

-			<repositories>

-				<repository>

-					<id>ecomp-releases</id>

-					<name>VID Release Repository</name>

-					<url>${nexusproxy}/${releaseNexusPath}</url>

-				</repository>

-				<repository>

-					<id>ecomp-snapshots</id>

-					<name>VID Snapshot Repository</name>

-					<url>${nexusproxy}/${snapshotNexusPath}</url>

-				</repository>

-				<repository>

-					<id>ecomp-staging</id>

-					<name>VID Staging Repository</name>

-					<url>${nexusproxy}/${stagingNexusPath}</url>

-				</repository>

-				<repository>

-					<!-- Snapshots repository has ECOMP snapshot artifacts -->

-					<id>oss-snapshots</id>

-					<name>oss Central - Snapshots</name>

-					<url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>

-				</repository>

-			</repositories>

-

-			<distributionManagement>

-				<repository>

-					<id>ecomp-releases</id>

-					<name>VID Release Repository</name>

-					<url>${nexusproxy}/${releaseNexusPath}</url>

-				</repository>

-				<snapshotRepository>

-					<id>ecomp-snapshots</id>

-					<name>VID Snapshot Repository</name>

-					<url>${nexusproxy}/${snapshotNexusPath}</url>

-				</snapshotRepository>

-				<!-- added for javadoc -->

-				<site>

-					<id>ecomp-site</id>

-					<url>dav:${nexusproxy}${sitePath}</url>

-				</site>

-			</distributionManagement>

-

-		</profile>

-

-		<profile>

-			<id>docker</id>

-			<modules>

-				<module>vid-app-common</module>

-				<module>vid-webpack-master</module>

-				<module>epsdk-app-onap</module>

-				<module>deliveries</module>

-			</modules>

-		</profile>

-	</profiles>

-

-	<properties>

-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-		<build.version>4.0.0-SNAPSHOT</build.version>

-		<nexusproxy>https://nexus.onap.org</nexusproxy>

-		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>

-		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>

-		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>

-		<sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>

-	</properties>

-

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.codehaus.mojo</groupId>

-				<artifactId>versions-maven-plugin</artifactId>

-				<version>1.3.1</version>

-			</plugin>

-			<plugin>

-				<groupId>org.sonatype.plugins</groupId>

-				<artifactId>nexus-staging-maven-plugin</artifactId>

-				<version>1.6.7</version>

-				<extensions>true</extensions>

-				<configuration>

-					<nexusUrl>${nexusproxy}</nexusUrl>

-					<stagingProfileId>176c31dfe190a</stagingProfileId>

-					<serverId>ecomp-staging</serverId>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-site-plugin</artifactId>

-				<version>3.6</version>

-				<dependencies>

-					<dependency>

-						<groupId>org.apache.maven.wagon</groupId>

-						<artifactId>wagon-webdav-jackrabbit</artifactId>

-						<version>2.10</version>

-					</dependency>

-				</dependencies>

-			</plugin>

-			<plugin>

-				<groupId>org.sonatype.plugins</groupId>

-				<artifactId>nexus-staging-maven-plugin</artifactId>

-				<version>1.6.7</version>

-				<extensions>true</extensions>

-				<configuration>

-					<nexusUrl>${nexusproxy}</nexusUrl>

-					<stagingProfileId>176c31dfe190a</stagingProfileId>

-					<serverId>ecomp-staging</serverId>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-deploy-plugin</artifactId>

-				<version>2.8</version>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-surefire-plugin</artifactId>

-				<version>2.17</version>

-				<configuration>

-				    <useSystemClassLoader>false</useSystemClassLoader>

-				</configuration>

-			</plugin>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-compiler-plugin</artifactId>

-				<version>2.3.2</version>

-

-				<configuration>

-					<debug>true</debug>

-					<compilerArgument>-Xlint</compilerArgument>

-					<verbose>true</verbose>

-					<showDeprecation>true</showDeprecation>

-					<showWarnings>true</showWarnings>

-					<source>1.8</source>

-					<target>1.8</target>

-				</configuration>

-			</plugin>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-site-plugin</artifactId>

-				<version>3.6</version>

-				<dependencies>

-					<dependency>

-						<groupId>org.apache.maven.wagon</groupId>

-						<artifactId>wagon-webdav-jackrabbit</artifactId>

-						<version>2.10</version>

-					</dependency>

-				</dependencies>

-			</plugin>

-			<plugin>

-				<groupId>org.sonarsource.scanner.maven</groupId>

-				<artifactId>sonar-maven-plugin</artifactId>

-				<version>3.3.0.603</version>

-			</plugin>

-			<plugin>

-				<groupId>com.blackducksoftware.integration</groupId>

-				<artifactId>hub-maven-plugin</artifactId>

-				<version>1.4.0</version>

-				<inherited>false</inherited>

-				<configuration>

-					<hubProjectName>${project.name}</hubProjectName>

-					<outputDirectory>${project.basedir}</outputDirectory>

-				</configuration>

-				<executions>

-					<execution>

-						<id>create-bdio-file</id>

-						<phase>package</phase>

-						<goals>

-							<goal>createHubOutput</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-

-	<!-- added for javadoc -->

-	<pluginRepositories>

-		<!-- Black Duck plugin dependencies -->

-		<pluginRepository>

-			<id>JCenter</id>

-			<name>JCenter Repository</name>

-			<url>http://jcenter.bintray.com</url>

-		</pluginRepository>

-

-		<pluginRepository>

-			<id>Restlet</id>

-			<name>Restlet Repository</name>

-			<url>http://maven.restlet.com</url>

-		</pluginRepository>

-	</pluginRepositories>

-	<reporting>

-		<plugins>

-

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-javadoc-plugin</artifactId>

-				<version>2.10.4</version>

-				<configuration>

-					<failOnError>false</failOnError>

-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>

-					<docletArtifact>

-						<groupId>org.umlgraph</groupId>

-						<artifactId>umlgraph</artifactId>

-						<version>5.6</version>

-					</docletArtifact>

-					<additionalparam>-views</additionalparam>

-					<useStandardDocletOptions>true</useStandardDocletOptions>

-				</configuration>

-			</plugin>

-		</plugins>

-	</reporting>

-	<dependencies>

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>4.11</version>

-			<scope>test</scope>

-		</dependency>

-		

-		<!--Overide versions for latest security fixes-->

-		<dependency>

-			<groupId>ch.qos.logback</groupId>

-			<artifactId>logback-core</artifactId>

-			<version>1.2.3</version>

-		</dependency>

-		<dependency>

-			<groupId>ch.qos.logback</groupId>

-			<artifactId>logback-classic</artifactId>

-			<version>1.2.3</version>

-		</dependency>

-		<dependency>

-			<groupId>commons-collections</groupId>

-			<artifactId>commons-collections</artifactId>

-			<version>3.2.2</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.poi</groupId>

-			<artifactId>poi</artifactId>

-			<version>3.17</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.httpcomponents</groupId>

-			<artifactId>httpclient</artifactId>

-			<version>4.5.3</version>

-		</dependency>

-	</dependencies>

+         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.onap.vid</groupId>

+    <artifactId>vid-parent</artifactId>

+    <version>4.0.0-SNAPSHOT</version>

+    <packaging>pom</packaging>

+    <name>vid</name>

+

+    <profiles>

+        <!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->

+

+        <profile>

+            <id>onap</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>vid-app-common</module>

+                <module>vid-webpack-master</module>

+                <module>epsdk-app-onap</module>

+            </modules>

+

+            <repositories>

+                <repository>

+                    <id>ecomp-releases</id>

+                    <name>VID Release Repository</name>

+                    <url>${nexusproxy}/${releaseNexusPath}</url>

+                </repository>

+                <repository>

+                    <id>ecomp-snapshots</id>

+                    <name>VID Snapshot Repository</name>

+                    <url>${nexusproxy}/${snapshotNexusPath}</url>

+                </repository>

+                <repository>

+                    <id>ecomp-staging</id>

+                    <name>VID Staging Repository</name>

+                    <url>${nexusproxy}/${stagingNexusPath}</url>

+                </repository>

+                <repository>

+                    <!-- Snapshots repository has ECOMP snapshot artifacts -->

+                    <id>oss-snapshots</id>

+                    <name>oss Central - Snapshots</name>

+                    <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>

+                </repository>

+            </repositories>

+

+            <distributionManagement>

+                <repository>

+                    <id>ecomp-releases</id>

+                    <name>VID Release Repository</name>

+                    <url>${nexusproxy}/${releaseNexusPath}</url>

+                </repository>

+                <snapshotRepository>

+                    <id>ecomp-snapshots</id>

+                    <name>VID Snapshot Repository</name>

+                    <url>${nexusproxy}/${snapshotNexusPath}</url>

+                </snapshotRepository>

+                <!-- added for javadoc -->

+                <site>

+                    <id>ecomp-site</id>

+                    <url>dav:${nexusproxy}${sitePath}</url>

+                </site>

+            </distributionManagement>

+

+        </profile>

+

+        <profile>

+            <id>docker</id>

+            <modules>

+                <module>vid-app-common</module>

+                <module>vid-webpack-master</module>

+                <module>epsdk-app-onap</module>

+                <module>deliveries</module>

+            </modules>

+        </profile>

+    </profiles>

+

+    <properties>

+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

+        <build.version>4.0.0-SNAPSHOT</build.version>

+        <nexusproxy>https://nexus.onap.org</nexusproxy>

+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>

+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>

+        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>

+        <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>

+    </properties>

+

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.codehaus.mojo</groupId>

+                <artifactId>versions-maven-plugin</artifactId>

+                <version>1.3.1</version>

+            </plugin>

+            <plugin>

+                <groupId>org.sonatype.plugins</groupId>

+                <artifactId>nexus-staging-maven-plugin</artifactId>

+                <version>1.6.7</version>

+                <extensions>true</extensions>

+                <configuration>

+                    <nexusUrl>${nexusproxy}</nexusUrl>

+                    <stagingProfileId>176c31dfe190a</stagingProfileId>

+                    <serverId>ecomp-staging</serverId>

+                </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-site-plugin</artifactId>

+                <version>3.6</version>

+                <dependencies>

+                    <dependency>

+                        <groupId>org.apache.maven.wagon</groupId>

+                        <artifactId>wagon-webdav-jackrabbit</artifactId>

+                        <version>2.10</version>

+                    </dependency>

+                </dependencies>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-deploy-plugin</artifactId>

+                <version>2.8</version>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-surefire-plugin</artifactId>

+                <version>2.17</version>

+                <configuration>

+                    <useSystemClassLoader>false</useSystemClassLoader>

+                </configuration>

+            </plugin>

+

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-compiler-plugin</artifactId>

+                <version>2.3.2</version>

+

+                <configuration>

+                    <debug>true</debug>

+                    <compilerArgument>-Xlint</compilerArgument>

+                    <verbose>true</verbose>

+                    <showDeprecation>true</showDeprecation>

+                    <showWarnings>true</showWarnings>

+                    <source>1.8</source>

+                    <target>1.8</target>

+                </configuration>

+            </plugin>

+            <plugin>

+                <groupId>org.sonarsource.scanner.maven</groupId>

+                <artifactId>sonar-maven-plugin</artifactId>

+                <version>3.3.0.603</version>

+            </plugin>

+            <plugin>

+                <groupId>com.blackducksoftware.integration</groupId>

+                <artifactId>hub-maven-plugin</artifactId>

+                <version>1.4.0</version>

+                <inherited>false</inherited>

+                <configuration>

+                    <hubProjectName>${project.name}</hubProjectName>

+                    <outputDirectory>${project.basedir}</outputDirectory>

+                </configuration>

+                <executions>

+                    <execution>

+                        <id>create-bdio-file</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>createHubOutput</goal>

+                        </goals>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+

+    <!-- added for javadoc -->

+    <pluginRepositories>

+        <!-- Black Duck plugin dependencies -->

+        <pluginRepository>

+            <id>JCenter</id>

+            <name>JCenter Repository</name>

+            <url>http://jcenter.bintray.com</url>

+        </pluginRepository>

+

+        <pluginRepository>

+            <id>Restlet</id>

+            <name>Restlet Repository</name>

+            <url>http://maven.restlet.com</url>

+        </pluginRepository>

+    </pluginRepositories>

+    <reporting>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-javadoc-plugin</artifactId>

+                <version>2.10.4</version>

+                <configuration>

+                    <failOnError>false</failOnError>

+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>

+                    <docletArtifact>

+                        <groupId>org.umlgraph</groupId>

+                        <artifactId>umlgraph</artifactId>

+                        <version>5.6</version>

+                    </docletArtifact>

+                    <additionalparam>-views</additionalparam>

+                    <useStandardDocletOptions>true</useStandardDocletOptions>

+                </configuration>

+            </plugin>

+        </plugins>

+    </reporting>

+    <dependencies>

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.11</version>

+            <scope>test</scope>

+        </dependency>

+

+        <!--Overide versions for latest security fixes-->

+        <dependency>

+            <groupId>ch.qos.logback</groupId>

+            <artifactId>logback-core</artifactId>

+            <version>1.2.3</version>

+        </dependency>

+        <dependency>

+            <groupId>ch.qos.logback</groupId>

+            <artifactId>logback-classic</artifactId>

+            <version>1.2.3</version>

+        </dependency>

+        <dependency>

+            <groupId>commons-collections</groupId>

+            <artifactId>commons-collections</artifactId>

+            <version>3.2.2</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.poi</groupId>

+            <artifactId>poi</artifactId>

+            <version>3.17</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.httpcomponents</groupId>

+            <artifactId>httpclient</artifactId>

+            <version>4.5.3</version>

+        </dependency>

+    </dependencies>

 </project>

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index d687568dc..175c07711 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -1,596 +1,597 @@
 <?xml version="1.0"?>
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
 
-	<!-- This is the Maven project object model (POM) file for VID web application 
-		based on the ECOMP SDK distribution. This file stands alone; it does not 
-		inherit from a parent maven module. -->
-	<groupId>org.onap.vid</groupId>
-	<artifactId>vid-app-common</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>war</packaging>
-	<name>VID Common</name>
-	<description>VID Common code for opensource version</description>
+    <!-- This is the Maven project object model (POM) file for VID web application
+        based on the ECOMP SDK distribution. This file stands alone; it does not
+        inherit from a parent maven module. -->
+    <groupId>org.onap.vid</groupId>
+    <artifactId>vid-app-common</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+    <name>VID Common</name>
+    <description>VID Common code for opensource version</description>
 
-	<properties>
-		<encoding>UTF-8</encoding>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<epsdk.version>2.4.0</epsdk.version>
-		<springframework.version>4.2.9.RELEASE</springframework.version>
-		<hibernate.version>4.3.11.Final</hibernate.version>
-		<!-- Skip assembling the zip by default -->
-		<skipassembly>true</skipassembly>
-		<!-- Tests usually require some setup that maven cannot do, so skip. -->
-		<skiptests>false</skiptests>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
-	</properties>
+    <properties>
+        <encoding>UTF-8</encoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <epsdk.version>2.4.0</epsdk.version>
+        <springframework.version>4.2.9.RELEASE</springframework.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <!-- Skip assembling the zip by default -->
+        <skipassembly>true</skipassembly>
+        <!-- Tests usually require some setup that maven cannot do, so skip. -->
+        <skiptests>false</skiptests>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+        <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
+    </properties>
 
 
-	<!-- this should be commented for local debugging -->
-	<!-- <deployenv>local</deployenv> -->
+    <!-- this should be commented for local debugging -->
+    <!-- <deployenv>local</deployenv> -->
 
-	<repositories>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>VID Release Repository</name>
-			<url>${nexusproxy}${releaseNexusPath}</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>VID Snapshot Repository</name>
-			<url>${nexusproxy}${snapshotNexusPath}</url>
-		</repository>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>VID Staging Repository</name>
-			<url>${nexusproxy}${stagingNexusPath}</url>
-		</repository>
-		<repository>
-			<!-- Snapshots repository has ECOMP snapshot artifacts -->
-			<id>oss-snapshots</id>
-			<name>oss Central - Snapshots</name>
-			<url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>
-		</repository>
+    <repositories>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>VID Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <repository>
+            <id>ecomp-snapshots</id>
+            <name>VID Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </repository>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>VID Staging Repository</name>
+            <url>${nexusproxy}${stagingNexusPath}</url>
+        </repository>
+        <repository>
+            <!-- Snapshots repository has ECOMP snapshot artifacts -->
+            <id>oss-snapshots</id>
+            <name>oss Central - Snapshots</name>
+            <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>
+        </repository>
 
-	</repositories>
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>VID Release Repository</name>
-			<url>${nexusproxy}/${releaseNexusPath}</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>VID Snapshot Repository</name>
-			<url>${nexusproxy}/${snapshotNexusPath}</url>
-		</snapshotRepository>
-		<!-- added for javadoc -->
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
-		</site>
-	</distributionManagement>
+    </repositories>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>VID Release Repository</name>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>VID Snapshot Repository</name>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <!-- added for javadoc -->
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 
-	<build>
-		<finalName>vid-common</finalName>
+    <build>
+        <finalName>vid-common</finalName>
 
-		<plugins>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>${nexusproxy}</nexusUrl>
-					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.9</version>
-				<executions>
-					<execution>
-						<id>default-prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>default-report</id>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tomcat.maven</groupId>
-				<artifactId>tomcat6-maven-plugin</artifactId>
-				<version>2.2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.tomcat.maven</groupId>
-				<artifactId>tomcat7-maven-plugin</artifactId>
-				<version>2.2</version>
-			</plugin>
+        <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <nexusUrl>${nexusproxy}</nexusUrl>
+                    <stagingProfileId>176c31dfe190a</stagingProfileId>
+                    <serverId>ecomp-staging</serverId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.9</version>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-report</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat6-maven-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
 
-			<!-- Generate POJOs from MSO json schema -->
-			<plugin>
-				<groupId>org.jsonschema2pojo</groupId>
-				<artifactId>jsonschema2pojo-maven-plugin</artifactId>
-				<version>0.4.23</version>
-				<configuration>
-					<sourceDirectory>${basedir}/src/main/resources/json/mso</sourceDirectory>
-					<targetPackage>org.onap.vid.domain.mso</targetPackage>
-					<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+            <!-- Generate POJOs from MSO json schema -->
+            <plugin>
+                <groupId>org.jsonschema2pojo</groupId>
+                <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+                <version>0.4.23</version>
+                <configuration>
+                    <sourceDirectory>${basedir}/src/main/resources/json/mso</sourceDirectory>
+                    <targetPackage>org.onap.vid.domain.mso</targetPackage>
+                    <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
-				<configuration>
-					<skipTests>${skiptests}</skipTests>
-					<includes>
-						<include>**/Test*.java</include>
-						<include>**/*Test.java</include>
-						<include>**/*TestCase.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/selenium/*.java</exclude>
-						<exclude>**/integrationTest/*.java</exclude>
-					</excludes>
-					<additionalClasspathElements>
-						<additionalClasspathElement>${basedir}/war</additionalClasspathElement>
-					</additionalClasspathElements>
-					<systemPropertyVariables>
-						<container.classpath>classpath:</container.classpath>
-					</systemPropertyVariables>
-					<useSystemClassLoader>false</useSystemClassLoader>
-				</configuration>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <skipTests>${skiptests}</skipTests>
+                    <includes>
+                        <include>**/Test*.java</include>
+                        <include>**/*Test.java</include>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/selenium/*.java</exclude>
+                        <exclude>**/integrationTest/*.java</exclude>
+                    </excludes>
+                    <additionalClasspathElements>
+                        <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
+                    </additionalClasspathElements>
+                    <systemPropertyVariables>
+                        <container.classpath>classpath:</container.classpath>
+                    </systemPropertyVariables>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<skipAssembly>${skipassembly}</skipAssembly>
-					<descriptors>
-						<descriptor>${basedir}/distribution.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <skipAssembly>${skipassembly}</skipAssembly>
+                    <descriptors>
+                        <descriptor>${basedir}/distribution.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<!-- Build a jar with all the Java classes -->
-					<attachClasses>true</attachClasses>
-					<!-- Do not put any jars in the war -->
-					<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.6</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.wagon</groupId>
-						<artifactId>wagon-webdav-jackrabbit</artifactId>
-						<version>2.10</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.4</version>
-				<executions>
-					<execution>
-						<id>get-the-git-infos</id>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-					<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
-					<dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
-					<generateGitPropertiesFile>true</generateGitPropertiesFile>
-					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-					<includeOnlyProperties>
-						 <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
-						 <includeOnlyProperty>^git.commit.message.short$</includeOnlyProperty>
-						 <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
-					</includeOnlyProperties>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <!-- Build a jar with all the Java classes -->
+                    <attachClasses>true</attachClasses>
+                    <!-- Do not put any jars in the war -->
+                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.6</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-webdav-jackrabbit</artifactId>
+                        <version>2.10</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.4</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                    <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+                    <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties
+                    </generateGitPropertiesFilename>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.message.short$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-					<docletArtifact>
-						<groupId>org.umlgraph</groupId>
-						<artifactId>umlgraph</artifactId>
-						<version>5.6</version>
-					</docletArtifact>
-					<additionalparam>-views</additionalparam>
-					<useStandardDocletOptions>true</useStandardDocletOptions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views</additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 
-	<dependencies>
-	
-		<dependency>
-		    <groupId>com.opencsv</groupId>
-		    <artifactId>opencsv</artifactId>
-		    <version>4.1</version>
-		</dependency>
-			
-		<!-- HTTP client -->
+    <dependencies>
 
-		<dependency>
-			<groupId>io.joshworks.unirest</groupId>
-			<artifactId>unirest-java</artifactId>
-			<version>0.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.3.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpasyncclient</artifactId>
-			<version>4.0.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpmime</artifactId>
-			<version>4.3.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.xebialabs.restito</groupId>
-			<artifactId>restito</artifactId>
-			<version>0.9.3</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>4.1</version>
+        </dependency>
 
-		<!-- Helpers -->
-		<dependency>
-			<groupId>io.vavr</groupId>
-			<artifactId>vavr</artifactId>
-			<version>0.9.2</version>
-		</dependency>
+        <!-- HTTP client -->
 
-		<!-- SDK overlay war -->
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-app-overlay</artifactId>
-			<version>${epsdk.version}</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-app-common</artifactId>
-			<version>${epsdk.version}</version>
-			<type>jar</type>
-		</dependency>
+        <dependency>
+            <groupId>io.joshworks.unirest</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>0.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.xebialabs.restito</groupId>
+            <artifactId>restito</artifactId>
+            <version>0.9.3</version>
+            <scope>test</scope>
+        </dependency>
 
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-core</artifactId>
-			<version>${epsdk.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-analytics</artifactId>
-			<version>${epsdk.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.lowagie</groupId>
-					<artifactId>itext</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-workflow</artifactId>
-			<version>${epsdk.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.att.eelf</groupId>
-			<artifactId>eelf-core</artifactId>
-			<version>1.0.0</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>powermock-api-mockito</artifactId>
-					<groupId>org.powermock</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>1.2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
-		</dependency>
+        <!-- Helpers -->
+        <dependency>
+            <groupId>io.vavr</groupId>
+            <artifactId>vavr</artifactId>
+            <version>0.9.2</version>
+        </dependency>
 
-		<!-- Mapper -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.6.3</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.8.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.6.7.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.13</version>
-		</dependency>
-		<dependency>
-			<groupId>com.mchange</groupId>
-			<artifactId>c3p0</artifactId>
-			<version>0.9.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>io.searchbox</groupId>
-			<artifactId>jest</artifactId>
-			<version>2.0.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
-			<!--<scope>test</scope>-->
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.bean-matchers</groupId>
-			<artifactId>bean-matchers</artifactId>
-			<version>0.11</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20160212</version>
-		</dependency>
-		<dependency>
-			<groupId>org.quartz-scheduler</groupId>
-			<artifactId>quartz</artifactId>
-			<version>2.2.1</version>
-			<exclusions>
-				<!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
-				<exclusion>
-					<groupId>c3p0</groupId>
-					<artifactId>c3p0</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!-- bridge to implement commons-logging using slf4j -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.12</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${springframework.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${springframework.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${springframework.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${springframework.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${springframework.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${springframework.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>2.23.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.connectors</groupId>
-			<artifactId>jersey-jetty-connector</artifactId>
-			<version>2.23.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.6.3</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.3</version>
-		</dependency>
-		<dependency>
-			<groupId>com.googlecode.json-simple</groupId>
-			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-java</artifactId>
-			<version>2.53.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-api</artifactId>
-			<version>2.53.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>6.8</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>2.23.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-firefox-driver</artifactId>
-			<version>2.53.1</version>
-		</dependency>
-		<dependency>
-			<groupId>xml-apis</groupId>
-			<artifactId>xml-apis</artifactId>
-			<version>1.4.01</version>
-		</dependency>
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>1.16</version>
-		</dependency>
-	        <dependency>
-	            <groupId>org.skyscreamer</groupId>
-	            <artifactId>jsonassert</artifactId>
-	            <version>1.5.0</version>
-	        </dependency>
-	        <dependency>
-	            <groupId>org.onap.sdc.sdc-tosca</groupId>
-	            <artifactId>sdc-tosca</artifactId>
-            	    <version>1.4.1</version>
-            	    <scope>compile</scope>
-	        </dependency>
-	        <dependency>
-	            <groupId>net.javacrumbs.json-unit</groupId>
-	            <artifactId>json-unit</artifactId>
-	            <version>1.23.0</version>
-	            <scope>test</scope>
-	        </dependency>
-	        <dependency>
-	            <groupId>org.apache.commons</groupId>
-	            <artifactId>commons-text</artifactId>
-	            <version>1.1</version>
-	        </dependency>
-	        <dependency>
-	            <groupId>org.hamcrest</groupId>
-	            <artifactId>java-hamcrest</artifactId>
-	            <version>2.0.0.0</version>
-	            <scope>test</scope>
-	        </dependency>
-	        <dependency>
-	            <groupId>org.togglz</groupId>
-	            <artifactId>togglz-spring-core</artifactId>
-	            <version>2.5.0.Final</version>
-	        </dependency>
-            <dependency>
-				<groupId>org.assertj</groupId>
-				<artifactId>assertj-core</artifactId>
-				<version>3.10.0</version>
-				<scope>compile</scope>
-		 	</dependency>
+        <!-- SDK overlay war -->
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-app-overlay</artifactId>
+            <version>${epsdk.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-app-common</artifactId>
+            <version>${epsdk.version}</version>
+            <type>jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-core</artifactId>
+            <version>${epsdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-analytics</artifactId>
+            <version>${epsdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.lowagie</groupId>
+                    <artifactId>itext</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-workflow</artifactId>
+            <version>${epsdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.att.eelf</groupId>
+            <artifactId>eelf-core</artifactId>
+            <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>powermock-api-mockito</artifactId>
+                    <groupId>org.powermock</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
+        <!-- Mapper -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.6.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.9.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.searchbox</groupId>
+            <artifactId>jest</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <!--<scope>test</scope>-->
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.bean-matchers</groupId>
+            <artifactId>bean-matchers</artifactId>
+            <version>0.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160212</version>
+        </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <version>2.2.1</version>
+            <exclusions>
+                <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
+                <exclusion>
+                    <groupId>c3p0</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- bridge to implement commons-logging using slf4j -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>2.23.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.connectors</groupId>
+            <artifactId>jersey-jetty-connector</artifactId>
+            <version>2.23.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <version>2.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>2.53.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-api</artifactId>
+            <version>2.53.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.23.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-firefox-driver</artifactId>
+            <version>2.53.1</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.4.01</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.16</version>
+        </dependency>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.sdc.sdc-tosca</groupId>
+            <artifactId>sdc-tosca</artifactId>
+            <version>1.4.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.javacrumbs.json-unit</groupId>
+            <artifactId>json-unit</artifactId>
+            <version>1.23.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>java-hamcrest</artifactId>
+            <version>2.0.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.togglz</groupId>
+            <artifactId>togglz-spring-core</artifactId>
+            <version>2.5.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.10.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index ed6a13c67..42c411cc3 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -30,27 +30,9 @@
         <coberturaBuildPhase>none</coberturaBuildPhase>
     </properties>
 
-
-    <!--distributionManagement>
-        <repository>
-            <id>vid-releases</id>
-            <name>VID Release Repository</name>
-            <url>https://162.242.254.138:8443/repository/maven-releases</url>
-        </repository>
-
-        <snapshotRepository>
-            <id>vid-snapshots</id>
-            <name>VID Snapshot Repository</name>
-            <url>https://162.242.254.138:8443/repository/maven-snapshots</url>
-        </snapshotRepository>
-    </distributionManagement-->
-
-
     <profiles>
-
         <profile>
             <id>onap</id>
-
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -73,8 +55,6 @@
 
         <profile>
             <id>default</id>
-
-
         </profile>
 
         <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
@@ -126,7 +106,7 @@
             <artifactId>mockserver-netty</artifactId>
             <version>3.11</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <version>4.3.4.RELEASE</version>
@@ -136,7 +116,7 @@
             <artifactId>spring-webmvc</artifactId>
             <version>4.3.4.RELEASE</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
             <version>2.8.7</version>
@@ -205,17 +185,4 @@
 
         </plugins>
     </build>
-
-   <!-- <build>
-        <finalName>vidSimulator</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.6.RELEASE</version>
-            </plugin>
-        </plugins>
-    </build>
--->
-
 </project>
\ No newline at end of file
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index 62d883d41..b4445dd04 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -16,10 +16,6 @@
 
   <properties>
     <encoding>UTF-8</encoding>
-    <!--<epsdk.version>1.3.0</epsdk.version>-->
-    <!--<springframework.version>4.2.0.RELEASE</springframework.version>-->
-    <!--<hibernate.version>4.3.11.Final</hibernate.version>-->
-    <!--<jackson.version>2.6.3</jackson.version>-->
     <!-- Skip assembling the zip by default -->
     <skipassembly>true</skipassembly>
     <!-- Tests usually require some setup that maven cannot do, so skip. -->
@@ -57,23 +53,25 @@
   </repositories>
 
   <distributionManagement>
-				<repository>
-					<id>ecomp-releases</id>
-					<name>VID Release Repository</name>
-					<url>${nexusproxy}/${releaseNexusPath}</url>
-				</repository>
-				<snapshotRepository>
-					<id>ecomp-snapshots</id>
-					<name>VID Snapshot Repository</name>
-					<url>${nexusproxy}/${snapshotNexusPath}</url>
-				</snapshotRepository>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>VID Release Repository</name>
+      <url>${nexusproxy}/${releaseNexusPath}</url>
+    </repository>
+    <snapshotRepository>
+      <id>ecomp-snapshots</id>
+      <name>VID Snapshot Repository</name>
+      <url>${nexusproxy}/${snapshotNexusPath}</url>
+    </snapshotRepository>
 
   </distributionManagement>
 
   <profiles>
     <profile>
       <id>if-not-webpack</id>
-      <activation><activeByDefault>true</activeByDefault></activation>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -86,9 +84,10 @@
                 <phase>validate</phase>
                 <configuration>
                   <target>
-                    <mkdir dir="${project.basedir}/dist/" />
+                    <mkdir dir="${project.basedir}/dist/"/>
                     <echo file="${project.basedir}/dist/NO-WEBPACK.txt" append="false">
-                      Note: 'webpack' profile was not selected while mvn build. This 'dist' folder was created to make the war creation through.
+                      Note: 'webpack' profile was not selected while mvn build. This 'dist' folder was created to make
+                      the war creation through.
                     </echo>
                   </target>
                 </configuration>
@@ -255,11 +254,7 @@
       </plugin>
 
     </plugins>
-
-
   </build>
-
   <dependencies>
   </dependencies>
-
 </project>