X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=841917b3d0bb2b1bff5e265cc7a8088bfb2a57b9;hb=5f6c178c3eaea6fffe7d46ca3c75dcb0ffa92755;hp=dfd00cf95983bc04e629df8a6a003b567732e631;hpb=054f1d1e13b4a7f0dc3a84d4c282019a3c528043;p=clamp.git

diff --git a/pom.xml b/pom.xml
index dfd00cf9..841917b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,19 +20,18 @@
   ============LICENSE_END============================================
   ===================================================================
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 		<modelVersion>4.0.0</modelVersion>
 		<groupId>org.onap.clamp</groupId>
 		<artifactId>clds</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>4.1.0-SNAPSHOT</version>
 		<name>clamp</name>
 
+
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.1.0</version>
+				<version>2.0.0</version>
 		</parent>
 
 		<description>
@@ -62,23 +61,23 @@
 				<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 				<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-				<docker.mariadb.port.host>3306</docker.mariadb.port.host>
-				<docker.http-cache.port.host>8085</docker.http-cache.port.host>
-				<project.scm.id>git-server</project.scm.id>
-				<java.version>1.8</java.version>
-
-				<swagger.jaxrs2.version>2.0.0-rc4</swagger.jaxrs2.version>
 				<eelf.core.version>1.0.0</eelf.core.version>
-				<camel.version>2.22.0</camel.version>
-				<springboot.version>2.0.2.RELEASE</springboot.version>
+				<camel.version>2.24.0</camel.version>
+				<springboot.version>2.1.5.RELEASE</springboot.version>
 
-				<sonar.language>java</sonar.language>
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 				<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 				<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
 				<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
 				<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 				<sonar.projectVersion>${project.version}</sonar.projectVersion>
+				<!-- Enable language to disable javascript analysis -->
+				<sonar.language>java</sonar.language>
+				<!-- Parameters for Javascript coverage
+					<sonar.sources>src/main,${project.build.directory}/clamp-ui/designer</sonar.sources>
+					<sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+				 -->
+				<sonar.exclusions>src/main/resources/**,**/clamp-ui/designer/lib/*</sonar.exclusions>
 
 				<docker.push.registry>localhost:5000</docker.push.registry>
 				<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
@@ -86,8 +85,8 @@
 				<docker.skip.push>true</docker.skip.push>
 				<docker.skip.tag>true</docker.skip.tag>
 				<skip.staging.artifacts>false</skip.staging.artifacts>
-				<python.http.proxy.param></python.http.proxy.param>
-				<tomcat.version>8.5.32</tomcat.version>
+				<python.http.proxy.param/>
+				<tomcat.version>9.0.20</tomcat.version>
 		</properties>
 
 		<profiles>
@@ -161,9 +160,15 @@
 
 		<repositories>
 				<repository>
-						<id>central</id>
-						<name>Maven 2 repository 2</name>
-						<url>http://repo2.maven.org/maven2/</url>
+					<id>onap-public</id>
+					<name>onap-public</name>
+					<url>https://nexus.onap.org/content/repositories/public/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
 				</repository>
 				<repository>
 						<id>ecomp-releases</id>
@@ -187,24 +192,27 @@
 						</releases>
 				</repository>
 				<repository>
-						<id>spring-repo</id>
-						<name>Spring repo</name>
-						<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
-				</repository>
-				<repository>
-						<id>repository.jboss.org-public</id>
-						<name>JBoss.org Maven repository</name>
-						<url>https://repository.jboss.org/nexus/content/groups/public</url>
-				</repository>
-				<repository>
-						<id>jcentral</id>
-						<name>bintray</name>
-						<url>http://jcenter.bintray.com</url>
-						<snapshots>
-								<enabled>false</enabled>
-						</snapshots>
+					<id>central</id>
+					<url>http://repo1.maven.org/maven2/</url>
 				</repository>
 		</repositories>
+		<pluginRepositories>
+			<pluginRepository>
+				<id>onap-public</id>
+				<name>onap-public</name>
+				<url>https://nexus.onap.org/content/repositories/public/</url>
+				<releases>
+					<enabled>true</enabled>
+				</releases>
+				<snapshots>
+					<enabled>false</enabled>
+				</snapshots>
+			</pluginRepository>
+			<pluginRepository>
+				<id>central</id>
+				<url>http://repo1.maven.org/maven2/</url>
+			</pluginRepository>
+		</pluginRepositories>
 
 		<dependencyManagement>
 				<dependencies>
@@ -228,11 +236,31 @@
 		</dependencyManagement>
 
 		<dependencies>
+			<dependency>
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>batik-svggen</artifactId>
+				<version>1.11</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>batik-svg-dom</artifactId>
+				<version>1.11</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>batik-transcoder</artifactId>
+				<version>1.11</version>
+			</dependency>
 				<dependency>
 						<groupId>com.att.eelf</groupId>
 						<artifactId>eelf-core</artifactId>
 						<version>${eelf.core.version}</version>
 				</dependency>
+				<dependency>
+						<groupId>org.codehaus.janino</groupId>
+						<artifactId>janino</artifactId>
+						<version>3.0.8</version>
+				</dependency>
 				<dependency>
 						<groupId>org.apache.tomcat.embed</groupId>
 						<artifactId>tomcat-embed-core</artifactId>
@@ -254,6 +282,10 @@
 						<version>${tomcat.version}</version>
 				</dependency>
 				<!-- For CAMEL -->
+				<dependency>
+					<groupId>org.apache.camel</groupId>
+					<artifactId>camel-http4-starter</artifactId>
+				</dependency>
 				<dependency>
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-spring-boot-starter</artifactId>
@@ -267,8 +299,26 @@
 						<artifactId>camel-servlet-starter</artifactId>
 				</dependency>
 				<dependency>
-					<groupId>org.apache.camel</groupId> 
-					<artifactId>camel-jackson</artifactId>
+						<groupId>org.apache.camel</groupId>
+						<artifactId>camel-gson-starter</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.camel</groupId>
+					<artifactId>camel-swagger-java-starter</artifactId>
+					<exclusions>
+						<exclusion>
+							<groupId>javax.ws.rs</groupId>
+							<artifactId>jsr311-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>org.slf4j</groupId>
+							<artifactId>slf4j-ext</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>com.fasterxml.jackson.core</groupId>
+							<artifactId>jackson-databind</artifactId>
+						</exclusion>
+					</exclusions>
 				</dependency>
 				<dependency>
 						<groupId>javax.xml.bind</groupId>
@@ -284,6 +334,12 @@
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-web</artifactId>
+						<exclusions>
+							<exclusion>
+								<groupId>org.springframework.boot</groupId>
+								<artifactId>spring-boot-starter-json</artifactId>
+								</exclusion>
+						</exclusions>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -297,10 +353,6 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-security</artifactId>
 				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-actuator</artifactId>
-				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-autoconfigure</artifactId>
@@ -316,11 +368,15 @@
 								</exclusion>
 						</exclusions>
 				</dependency>
+				<dependency>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-data-jpa</artifactId>
+				</dependency>
 				<!-- Others dependencies -->
 				<dependency>
 					<groupId>org.onap.aaf.authz</groupId>
 					<artifactId>aaf-cadi-aaf</artifactId>
-					<version>2.1.1</version>
+					<version>2.1.10</version>
 					<exclusions>
 						<exclusion>
 							<groupId>javax.servlet</groupId>
@@ -351,6 +407,7 @@
 				<dependency>
 						<groupId>com.googlecode.json-simple</groupId>
 						<artifactId>json-simple</artifactId>
+						<version>1.1.1</version>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.commons</groupId>
@@ -387,7 +444,7 @@
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineAPI</artifactId>
-						<version>1.2.0</version>
+						<version>1.3.3</version>
 						<exclusions>
 								<exclusion>
 										<groupId>com.google.guava</groupId>
@@ -429,6 +486,10 @@
 										<groupId>org.onap.policy.common</groupId>
 										<artifactId>integrity-audit</artifactId>
 								</exclusion>
+								<exclusion>
+									<groupId>com.fasterxml.jackson.core</groupId>
+									<artifactId>jackson-databind</artifactId>
+								</exclusion>
 								<exclusion>
 										<groupId>org.onap.aaf.cadi</groupId>
 										<artifactId>cadi-aaf</artifactId>
@@ -437,12 +498,20 @@
 										<groupId>javax.jms</groupId>
 										<artifactId>jms</artifactId>
 								</exclusion>
+								<exclusion>
+										<groupId>commons-fileupload</groupId>
+										<artifactId>commons-fileupload</artifactId>
+								</exclusion>
+								<exclusion>
+										<groupId>com.att.research.xacml</groupId>
+										<artifactId>xacml</artifactId>
+								</exclusion>
 						</exclusions>
 				</dependency>
 				<dependency>
 						<groupId>org.onap.policy.common</groupId>
 						<artifactId>ONAP-Logging</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -459,9 +528,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
 						<artifactId>policy-yaml</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -478,9 +547,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
 						<artifactId>sdc</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -497,9 +566,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
 						<artifactId>aai</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -526,11 +595,6 @@
 						<artifactId>plexus-utils</artifactId>
 						<version>3.0.24</version>
 				</dependency>
-				<dependency>
-						<groupId>commons-fileupload</groupId>
-						<artifactId>commons-fileupload</artifactId>
-						<version>1.3.3</version>
-				</dependency>
 				<dependency>
 						<groupId>org.jboss.spec.javax.ws.rs</groupId>
 						<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
@@ -539,7 +603,7 @@
 				<dependency>
 						<groupId>com.google.guava</groupId>
 						<artifactId>guava</artifactId>
-						<version>25.1-jre</version>
+						<version>27.0-jre</version>
 				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
@@ -556,7 +620,7 @@
 				<dependency>
 						<groupId>org.onap.sdc.sdc-tosca</groupId>
 						<artifactId>sdc-tosca</artifactId>
-						<version>1.3.0</version>
+						<version>1.5.1</version>
 				</dependency>
 				<!-- TESTING -->
 				<dependency>
@@ -572,16 +636,7 @@
 					<scope>test</scope>
 				</dependency>
 		</dependencies>
-		<pluginRepositories>
-				<pluginRepository>
-						<snapshots>
-								<enabled>false</enabled>
-						</snapshots>
-						<id>jcenter-releases</id>
-						<name>jcenter</name>
-						<url>http://jcenter.bintray.com</url>
-				</pluginRepository>
-		</pluginRepositories>
+
 		<build>
 				<finalName>clamp</finalName>
 
@@ -610,11 +665,39 @@
 								<filtering>false</filtering>
 								<targetPath>example/sdc</targetPath>
 						</testResource>
+
+						<!-- Copy the NPM package.json for CLAMP UI javascript testing framework -->
+						<testResource>
+								<directory>src/test/javascript</directory>
+								<includes>
+										<include>**/**.json</include>
+								</includes>
+								<filtering>true</filtering>
+								<targetPath>${project.build.directory}/clamp-ui</targetPath>
+						</testResource>
+						<testResource>
+								<directory>src/main/resources/META-INF/resources/designer</directory>
+								<filtering>false</filtering>
+								<targetPath>${project.build.directory}/clamp-ui/designer</targetPath>
+						</testResource>
 				</testResources>
 				<resources>
+						<!--  For AAF folder maven should not try to filter Keystores/Truststores ...
+							  Otherwise they will be broken and unreadable
+						-->
 						<resource>
 								<directory>src/main/resources</directory>
 								<filtering>true</filtering>
+								<excludes>
+									<exclude>clds/aaf/**</exclude>
+								</excludes>
+						</resource>
+						<resource>
+								<directory>src/main/resources</directory>
+								<filtering>false</filtering>
+								<includes>
+									<include>clds/aaf/**</include>
+								</includes>
 						</resource>
 						<resource>
 								<directory>src/main/docker</directory>
@@ -626,6 +709,125 @@
 				</resources>
 
 				<plugins>
+						<plugin>
+							<groupId>de.jpdigital</groupId>
+							<artifactId>hibernate52-ddl-maven-plugin</artifactId>
+							<version>2.2.0</version>
+							<dependencies>
+								<dependency>
+									<groupId>javax.xml.bind</groupId>
+									<artifactId>jaxb-api</artifactId>
+									<version>2.3.0</version>
+								</dependency>
+							</dependencies>
+							<executions>
+								<execution>
+									<phase>process-classes</phase>
+									<goals>
+										<goal>gen-ddl</goal>
+									</goals>
+									<configuration>
+										<packages><param>org.onap.clamp.dao.model</param></packages>
+										<dialects><param>MARIADB53</param></dialects>
+										<outputDirectory>${project.basedir}/extra/sql/bulkload/</outputDirectory>
+										<outputFileNameSuffix>create-tables</outputFileNameSuffix>
+										<!-- <createDropStatements>true</createDropStatements> -->
+										<omitDialectFromFileName>true</omitDialectFromFileName>
+									</configuration>
+								</execution>
+							</executions>
+
+						</plugin>
+						<!-- Read the swagger.json file and the definition from SwaggerConfig.java;
+							generate a list of .adoc files containing the APIs info in more structured
+							way -->
+						<plugin>
+								<groupId>io.github.swagger2markup</groupId>
+								<artifactId>swagger2markup-maven-plugin</artifactId>
+								<version>1.3.3</version>
+								<dependencies>
+										<dependency>
+												<groupId>io.github.swagger2markup</groupId>
+												<artifactId>swagger2markup-import-files-ext</artifactId>
+												<version>1.3.3</version>
+										</dependency>
+										<dependency>
+												<groupId>io.github.swagger2markup</groupId>
+												<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
+												<version>1.3.3</version>
+										</dependency>
+								</dependencies>
+								<configuration>
+										<swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
+										<outputDir>${project.build.directory}/asciidoc/generated</outputDir>
+										<config>
+												<swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
+										</config>
+								</configuration>
+								<executions>
+										<execution>
+												<phase>post-integration-test</phase>
+												<goals>
+														<goal>convertSwagger2markup</goal>
+												</goals>
+										</execution>
+								</executions>
+						</plugin>
+
+						<!-- Run the generated asciidoc through Asciidoctor to generate other
+								documentation types, such as PDFs or HTML5 -->
+						<plugin>
+								<groupId>org.asciidoctor</groupId>
+								<artifactId>asciidoctor-maven-plugin</artifactId>
+								<version>1.5.7.1</version>
+								<dependencies>
+										<dependency>
+												<groupId>org.asciidoctor</groupId>
+												<artifactId>asciidoctorj-pdf</artifactId>
+												<version>1.5.0-alpha.10.1</version>
+										</dependency>
+								</dependencies>
+								<configuration>
+										<sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
+										<sourceDocumentName>swagger.adoc</sourceDocumentName>
+										<attributes>
+												<doctype>book</doctype>
+												<toc>left</toc>
+												<toclevels>3</toclevels>
+												<numbered/>
+												<hardbreaks/>
+												<sectlinks/>
+												<sectanchors/>
+												<generated>${project.build.directory}/asciidoc/generated</generated>
+										</attributes>
+								</configuration>
+
+								<executions>
+										<execution>
+												<id>output-html</id>
+												<phase>post-integration-test</phase>
+												<goals>
+														<goal>process-asciidoc</goal>
+												</goals>
+												<configuration>
+														<backend>html5</backend>
+														<outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+														<outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory>
+												</configuration>
+										</execution>
+										<execution>
+												<id>output-pdf</id>
+												<phase>post-integration-test</phase>
+												<goals>
+														<goal>process-asciidoc</goal>
+												</goals>
+												<configuration>
+														<backend>pdf</backend>
+														<outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+												</configuration>
+										</execution>
+								</executions>
+						</plugin>
 						<plugin>
 								<groupId>org.codehaus.groovy.maven</groupId>
 								<artifactId>gmaven-plugin</artifactId>
@@ -682,6 +884,22 @@
 														</artifacts>
 												</configuration>
 										</execution>
+										<execution>
+											<id>reserve-port-for-tests</id>
+											<phase>process-resources</phase>
+											<goals>
+												<goal>reserve-network-port</goal>
+											</goals>
+											<configuration>
+												<portNames>
+													<portName>docker.mariadb.port.host</portName>
+													<portName>docker.http-cache.port.host</portName>
+													<portName>clamp.it.tests.http-redirected</portName>
+													<portName>clamp.it.tests.https</portName>
+													<portName>clamp.it.tests.http</portName>
+												</portNames>
+											</configuration>
+										</execution>
 								</executions>
 						</plugin>
 
@@ -700,34 +918,22 @@
 										</execution>
 								</executions>
 						</plugin>
-						<plugin>
-								<groupId>org.sonatype.plugins</groupId>
-								<artifactId>nexus-staging-maven-plugin</artifactId>
-								<version>1.6.7</version>
-								<extensions>true</extensions>
-								<configuration>
-										<nexusUrl>https://nexus.onap.org</nexusUrl>
-										<stagingProfileId>176c31dfe190a</stagingProfileId>
-										<serverId>ecomp-staging</serverId>
-										<skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
-								</configuration>
-						</plugin>
-
 						<plugin>
 								<groupId>org.apache.maven.plugins</groupId>
 								<artifactId>maven-surefire-plugin</artifactId>
-								<version>2.19.1</version>
+								<version>2.22.1</version>
 								<configuration>
-										<forkCount>1</forkCount>
-										<reuseForks>false</reuseForks>
+										<forkCount>1C</forkCount>
+										<reuseForks>true</reuseForks>
+										<useSystemClassLoader>false</useSystemClassLoader>
+										<argLine>${surefireArgLine}</argLine>
 								</configuration>
 						</plugin>
 
 						<plugin>
 								<groupId>org.apache.maven.plugins</groupId>
 								<artifactId>maven-failsafe-plugin</artifactId>
-								<version>2.17</version>
-
+								<version>2.22.1</version>
 								<executions>
 										<execution>
 												<id>integration-tests</id>
@@ -736,11 +942,16 @@
 														<goal>verify</goal>
 												</goals>
 												<configuration>
+														<additionalClasspathElements>
+															<additionalClasspathElement>${project.build.directory}/classes</additionalClasspathElement>
+														</additionalClasspathElements>
 														<includes>
 																<include>**/*ItCase.java</include>
 														</includes>
 														<forkCount>1</forkCount>
-														<reuseForks>false</reuseForks>
+														<reuseForks>true</reuseForks>
+														<useSystemClassLoader>false</useSystemClassLoader>
+														<argLine>${failsafeArgLine}</argLine>
 												</configuration>
 										</execution>
 								</executions>
@@ -749,13 +960,20 @@
 						<plugin>
 								<groupId>io.fabric8</groupId>
 								<artifactId>docker-maven-plugin</artifactId>
-								<version>0.26.0</version>
+								<version>0.27.2</version>
+								<dependencies>
+									<dependency>
+										<groupId>org.apache.httpcomponents</groupId>
+										<artifactId>httpclient</artifactId>
+										<version>4.5.5</version>
+									</dependency>
+								</dependencies>
 								<configuration>
 										<verbose>true</verbose>
-										<apiVersion>1.23</apiVersion>
+										<apiVersion>1.35</apiVersion>
 										<images>
 												<image>
-														<name>library/mariadb:10.1.11</name>
+														<name>library/mariadb:10.3.12</name>
 														<alias>mariadb</alias>
 														<run>
 																<env>
@@ -807,8 +1025,8 @@
 														</run>
 												</image>
 												<image>
-														<name>onap/clamp</name>
-														<alias>onap-clamp</alias>
+														<name>onap/clamp-backend</name>
+														<alias>onap-clamp-backend</alias>
 														<run>
 															<skip>true</skip>
 														</run>
@@ -819,15 +1037,85 @@
 																		<tag>${project.docker.latesttagtimestamp.version}</tag>
 																		<tag>${project.docker.latesttag.version}</tag>
 																</tags>
-																<!-- A relative path is looked up in ${project.basedir}/src/main/docker 
+																<!-- A relative path is looked up in ${project.basedir}/src/main/docker
 																		by default -->
-																<dockerFile>Dockerfile</dockerFile>
+																<dockerFile>backend/Dockerfile</dockerFile>
 																<assembly>
-																		<descriptor>assembly/clamp-files.xml</descriptor>
-																		<name>onap-clamp</name>
+																		<descriptor>backend/backend-files.xml</descriptor>
+																		<name>onap-clamp-backend</name>
 																</assembly>
 														</build>
 												</image>
+												<image>
+														<name>onap/clamp-frontend</name>
+														<alias>onap-clamp-frontend</alias>
+														<run>
+															<skip>true</skip>
+														</run>
+														<build>
+																<cleanup>true</cleanup>
+																<tags>
+																		<tag>latest</tag>
+																		<tag>${project.docker.latesttagtimestamp.version}</tag>
+																		<tag>${project.docker.latesttag.version}</tag>
+																</tags>
+																<!-- A relative path is looked up in ${project.basedir}/src/main/docker
+																		by default -->
+																<dockerFile>frontend/Dockerfile</dockerFile>
+																<assembly>
+																		<descriptor>frontend/frontend-files.xml</descriptor>
+																		<name>onap-clamp-frontend</name>
+																</assembly>
+														</build>
+												</image>
+												<image>
+														<name>onap/clamp-dashboard-elasticsearch</name>
+														<alias>onap-clamp-dashboard-elasticsearch</alias>
+														<run>
+															<skip>true</skip>
+														</run>
+														<build>
+																<cleanup>true</cleanup>
+																<tags>
+																		<tag>latest</tag>
+																		<tag>${project.docker.latesttagtimestamp.version}</tag>
+																		<tag>${project.docker.latesttag.version}</tag>
+																</tags>
+																<dockerFile>elasticsearch/Dockerfile</dockerFile>
+														</build>
+												</image>
+												<image>
+														<name>onap/clamp-dashboard-logstash</name>
+														<alias>onap-clamp-dashboard-logstash</alias>
+														<run>
+															<skip>true</skip>
+														</run>
+														<build>
+																<cleanup>true</cleanup>
+																<tags>
+																		<tag>latest</tag>
+																		<tag>${project.docker.latesttagtimestamp.version}</tag>
+																		<tag>${project.docker.latesttag.version}</tag>
+																</tags>
+																<dockerFile>logstash/Dockerfile</dockerFile>
+														</build>
+												</image>
+												<image>
+														<name>onap/clamp-dashboard-kibana</name>
+														<alias>onap-clamp-dashboard-kibana</alias>
+														<run>
+															<skip>true</skip>
+														</run>
+														<build>
+																<cleanup>true</cleanup>
+																<tags>
+																		<tag>latest</tag>
+																		<tag>${project.docker.latesttagtimestamp.version}</tag>
+																		<tag>${project.docker.latesttag.version}</tag>
+																</tags>
+																<dockerFile>kibana/Dockerfile</dockerFile>
+														</build>
+												</image>
 										</images>
 								</configuration>
 
@@ -866,9 +1154,10 @@
 						<plugin>
 								<groupId>org.jacoco</groupId>
 								<artifactId>jacoco-maven-plugin</artifactId>
-								<version>0.7.7.201606060606</version>
+								<version>0.8.2</version>
 								<configuration>
 										<dumpOnExit>true</dumpOnExit>
+										<append>true</append>
 										<includes>
 												<include>org.onap.clamp.*</include>
 										</includes>
@@ -881,6 +1170,7 @@
 												</goals>
 												<configuration>
 														<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+														<propertyName>surefireArgLine</propertyName>
 														<!-- <append>true</append> -->
 												</configuration>
 										</execution>
@@ -892,6 +1182,7 @@
 												</goals>
 												<configuration>
 														<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+														<propertyName>failsafeArgLine</propertyName>
 														<!-- <append>true</append> -->
 												</configuration>
 										</execution>
@@ -921,6 +1212,52 @@
 								<artifactId>versions-maven-plugin</artifactId>
 								<version>1.3.1</version>
 						</plugin>
+
+					<plugin>
+						<groupId>com.github.eirslett</groupId>
+						<artifactId>frontend-maven-plugin</artifactId>
+						<version>1.6</version>
+						<configuration>
+							<installDirectory>${project.build.directory}/clamp-ui</installDirectory>
+							<workingDirectory>${project.build.directory}/clamp-ui</workingDirectory>
+							<skip>${maven.test.skip}</skip>
+						</configuration>
+
+						<executions>
+							<execution>
+								<id>install_node_and_npm</id>
+								<goals>
+									<goal>install-node-and-npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<nodeVersion>v8.11.1</nodeVersion>
+									<npmVersion>5.6.0</npmVersion>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm_install</id>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<arguments>install</arguments>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm_test</id>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<arguments>run-script test:coverage</arguments>
+								</configuration>
+							</execution>
+
+						</executions>
+					</plugin>
 				</plugins>
 		</build>
 </project>