X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=297b0a10c474b397ea7b31d05a819aaf678c363e;hb=5dea22255fc131d5c2b0348986bfc75c56d17097;hp=6a58cb7b647f9a74beb21277b4b284c5d95c0c91;hpb=7e836e1ff7e918961e9003c5dc8126cf84d24da2;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 6a58cb7b..297b0a10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,19 +20,17 @@
   ============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.0.0-SNAPSHOT</version>
 		<name>clamp</name>
 
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0</version>
 		</parent>
 
 		<description>
@@ -62,47 +60,102 @@
 				<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>
-				<guava.version>20.0</guava.version>
 				<eelf.core.version>1.0.0</eelf.core.version>
-				<camel.version>2.20.1</camel.version>
-				<springboot.version>1.5.12.RELEASE</springboot.version>
-
-				<sonar.language>java</sonar.language>
+				<camel.version>2.22.1</camel.version>
+				<springboot.version>2.0.6.RELEASE</springboot.version>
+				
 				<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>
 				<docker.skip.build>true</docker.skip.build>
 				<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.28</tomcat.version>
+				<python.http.proxy.param/>
+				<tomcat.version>8.5.34</tomcat.version>
 		</properties>
 
+		<profiles>
+				<profile>
+						<id>without-test</id>
+						<activation>
+							<property>
+								<name>maven.test.skip</name>
+								<value>true</value>
+							</property>
+						</activation>
+						<properties>
+							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
+						</properties>
+				</profile>
+				<profile>
+						<id>without-IT-only</id>
+						<activation>
+							<property>
+								<name>skipITs</name>
+								<value>true</value>
+							</property>
+						</activation>
+						<properties>
+							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
+						</properties>
+				</profile>
+				<profile>
+						<id>without-IT-only2</id>
+						<activation>
+							<property>
+								<name>skipTests</name>
+								<value>true</value>
+							</property>
+						</activation>
+						<properties>
+							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
+						</properties>
+				</profile>
+				<profile>
+						<id>docker</id>
+						<properties>
+								<skip.staging.artifacts>true</skip.staging.artifacts>
+								<docker.skip.build>false</docker.skip.build>
+								<docker.skip.tag>false</docker.skip.tag>
+								<docker.skip.push>false</docker.skip.push>
+								<docker.skip>false</docker.skip>
+						</properties>
+				</profile>
+		</profiles>
+
 		<distributionManagement>
 				<repository>
-						<id>ecomp-releases</id>
+						<id>onap-releases</id>
 						<name>Clamp Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<snapshotRepository>
-						<id>ecomp-snapshots</id>
+						<id>onap-snapshots</id>
 						<name>Clamp Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 				</snapshotRepository>
 				<site>
-						<id>ecomp-site</id>
+						<id>onap-site</id>
 						<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
 				</site>
 		</distributionManagement>
@@ -114,17 +167,17 @@
 						<url>http://repo2.maven.org/maven2/</url>
 				</repository>
 				<repository>
-						<id>ecomp-releases</id>
+						<id>onap-releases</id>
 						<name>ONAP Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<repository>
-						<id>ecomp-staging</id>
+						<id>onap-staging</id>
 						<name>ONAP Staging Repository</name>
 						<url>https://nexus.onap.org/content/repositories/staging/</url>
 				</repository>
 				<repository>
-						<id>ecomp-snapshots</id>
+						<id>onap-snapshots</id>
 						<name>ONAP Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 						<snapshots>
@@ -144,14 +197,6 @@
 						<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>
-				</repository>
 		</repositories>
 
 		<dependencyManagement>
@@ -181,6 +226,11 @@
 						<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>
@@ -214,11 +264,34 @@
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-servlet-starter</artifactId>
 				</dependency>
+				<dependency>
+					<groupId>org.apache.camel</groupId> 
+					<artifactId>camel-jackson-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>
+					</exclusions>
+				</dependency>
 				<dependency>
 						<groupId>javax.xml.bind</groupId>
 						<artifactId>jaxb-api</artifactId>
 						<version>2.3.0</version>
 				</dependency>
+				<dependency>
+					<groupId>org.glassfish.jersey.core</groupId>
+					<artifactId>jersey-common</artifactId>
+					<version>2.27</version>
+				</dependency>
 				<!-- Spring famework -->
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -228,11 +301,6 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-tomcat</artifactId>
 				</dependency>
-				<dependency>
-						<groupId>com.paypal.springboot</groupId>
-						<artifactId>resteasy-spring-boot-starter</artifactId>
-						<version>2.3.4-RELEASE</version>
-				</dependency>
 				<dependency>
 						<groupId>org.springframework</groupId>
 						<artifactId>spring-jdbc</artifactId>
@@ -243,7 +311,7 @@
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-actuator</artifactId>
+					<artifactId>spring-boot-autoconfigure</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -324,20 +392,10 @@
 						<artifactId>persistence-api</artifactId>
 						<version>1.0.2</version>
 				</dependency>
-				<dependency>
-						<groupId>org.hibernate</groupId>
-						<artifactId>hibernate-annotations</artifactId>
-						<version>3.5.6-Final</version>
-				</dependency>
-				<dependency>
-						<groupId>dom4j</groupId>
-						<artifactId>dom4j</artifactId>
-				</dependency>
-
 				<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>
@@ -364,34 +422,43 @@
 										<artifactId>commons-io</artifactId>
 								</exclusion>
 								<exclusion>
-										<artifactId>grizzly-http</artifactId>
+										<artifactId>grizzly-http-server</artifactId>
 										<groupId>org.glassfish.grizzly</groupId>
 								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.policy.common</groupId>
-						<artifactId>ONAP-Logging</artifactId>
-						<version>1.1.3</version>
-						<exclusions>
 								<exclusion>
-										<artifactId>log4j</artifactId>
-										<groupId>log4j</groupId>
+										<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+										<artifactId>dmaapClient</artifactId>
 								</exclusion>
 								<exclusion>
-										<groupId>org.slf4j</groupId>
-										<artifactId>slf4j-log4j12</artifactId>
+										<groupId>org.onap.policy.common</groupId>
+										<artifactId>integrity-monitor</artifactId>
 								</exclusion>
 								<exclusion>
-										<artifactId>apache-log4j-extras</artifactId>
-										<groupId>log4j</groupId>
+										<groupId>org.onap.policy.common</groupId>
+										<artifactId>integrity-audit</artifactId>
+								</exclusion>
+								<exclusion>
+										<groupId>org.onap.aaf.cadi</groupId>
+										<artifactId>cadi-aaf</artifactId>
+								</exclusion>
+								<exclusion>
+										<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.engine</groupId>
-						<artifactId>PolicyEngineUtils</artifactId>
-						<version>1.1.3</version>
+						<groupId>org.onap.policy.common</groupId>
+						<artifactId>ONAP-Logging</artifactId>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -405,24 +472,12 @@
 										<artifactId>apache-log4j-extras</artifactId>
 										<groupId>log4j</groupId>
 								</exclusion>
-								<exclusion>
-										<groupId>mysql</groupId>
-										<artifactId>mysql-connector-java</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.mariadb.jdbc</groupId>
-										<artifactId>mariadb-java-client</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>com.att.nsa</groupId>
-										<artifactId>dmaapClient</artifactId>
-								</exclusion>
 						</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>
@@ -439,9 +494,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>
@@ -458,9 +513,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>
@@ -481,32 +536,21 @@
 						<artifactId>commons-csv</artifactId>
 						<version>1.3</version>
 				</dependency>
-				<dependency>
-						<groupId>com.sun.faces</groupId>
-						<artifactId>jsf-api</artifactId>
-						<version>2.1.7</version>
-				</dependency>
-				<dependency>
-						<groupId>com.sun.faces</groupId>
-						<artifactId>jsf-impl</artifactId>
-						<version>2.1.7</version>
-				</dependency>
 				<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
 				<dependency>
 						<groupId>org.codehaus.plexus</groupId>
 						<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>
 						<version>1.0.1.Final</version>
 				</dependency>
+				<dependency>
+						<groupId>com.google.guava</groupId>
+						<artifactId>guava</artifactId>
+				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
 						<groupId>org.mariadb.jdbc</groupId>
@@ -522,34 +566,33 @@
 				<dependency>
 						<groupId>org.onap.sdc.sdc-tosca</groupId>
 						<artifactId>sdc-tosca</artifactId>
-						<version>1.3.0</version>
+						<version>1.4.1</version>
 				</dependency>
-				<!-- To generate Swagger.json, swagger.html and swagger.pdf -->
+				<!-- TESTING -->
 				<dependency>
-						<groupId>io.springfox</groupId>
-						<artifactId>springfox-swagger2</artifactId>
-						<version>2.4.0</version>
+						<groupId>org.assertj</groupId>
+						<artifactId>assertj-core</artifactId>
+						<version>3.10.0</version>
 						<scope>test</scope>
 				</dependency>
 				<dependency>
-						<groupId>io.github.robwin</groupId>
-						<artifactId>assertj-swagger</artifactId>
-						<version>0.2.0</version>
-						<scope>test</scope>
-				</dependency>
-				<dependency>
-						<groupId>io.github.swagger2markup</groupId>
-						<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-						<version>1.2.0</version>
-						<scope>test</scope>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+					<version>1.10.19</version>
+					<scope>test</scope>
 				</dependency>
 		</dependencies>
 		<pluginRepositories>
+				<pluginRepository>
+						<id>central-for-plugins</id>
+						<name>Maven 2 repository 2</name>
+						<url>http://repo2.maven.org/maven2/</url>
+				</pluginRepository>
 				<pluginRepository>
 						<snapshots>
 								<enabled>false</enabled>
 						</snapshots>
-						<id>jcenter-releases</id>
+						<id>jcenter-releases-for-plugins</id>
 						<name>jcenter</name>
 						<url>http://jcenter.bintray.com</url>
 				</pluginRepository>
@@ -582,11 +625,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>
@@ -598,43 +669,55 @@
 				</resources>
 
 				<plugins>
-						<!-- Scan Clamp code and generate the swagger.json file with all the 
-								APIs -->
 						<plugin>
-								<groupId>com.sebastian-daschner</groupId>
-								<artifactId>jaxrs-analyzer-maven-plugin</artifactId>
-								<version>0.14</version>
-								<executions>
-										<execution>
-												<phase>test</phase>
-												<goals>
-														<goal>analyze-jaxrs</goal>
-												</goals>
-												<configuration>
-														<backend>swagger</backend>
-														<resourcesDir>../docs/swagger/</resourcesDir>
-												</configuration>
-										</execution>
-								</executions>
+							<groupId>org.sonatype.plugins</groupId>
+							<artifactId>port-allocator-maven-plugin</artifactId>
+							<version>1.2</version>
+							<executions>
+								<execution>
+									<phase>validate</phase>
+									<goals>
+										<goal>allocate-ports</goal>
+									</goals>
+									<configuration>
+										<ports>
+											<port>
+												<name>docker.mariadb.port.host</name>
+											</port>
+											<port>
+												<name>docker.http-cache.port.host</name>
+											</port>
+											<port>
+												<name>clamp.it.tests.http-redirected</name>
+											</port>
+											<port>
+												<name>clamp.it.tests.https</name>
+											</port>
+											<port>
+												<name>clamp.it.tests.http</name>
+											</port>
+										</ports>
+									</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 -->
+							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.1</version>
+								<version>1.3.3</version>
 								<dependencies>
 										<dependency>
 												<groupId>io.github.swagger2markup</groupId>
 												<artifactId>swagger2markup-import-files-ext</artifactId>
-												<version>1.3.1</version>
+												<version>1.3.3</version>
 										</dependency>
 										<dependency>
 												<groupId>io.github.swagger2markup</groupId>
 												<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-												<version>1.3.1</version>
+												<version>1.3.3</version>
 										</dependency>
 								</dependencies>
 								<configuration>
@@ -646,7 +729,7 @@
 								</configuration>
 								<executions>
 										<execution>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>convertSwagger2markup</goal>
 												</goals>
@@ -659,7 +742,7 @@
 						<plugin>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctor-maven-plugin</artifactId>
-								<version>1.5.3</version>
+								<version>1.5.6</version>
 								<dependencies>
 										<dependency>
 												<groupId>org.asciidoctor</groupId>
@@ -679,10 +762,10 @@
 												<doctype>book</doctype>
 												<toc>left</toc>
 												<toclevels>3</toclevels>
-												<numbered></numbered>
-												<hardbreaks></hardbreaks>
-												<sectlinks></sectlinks>
-												<sectanchors></sectanchors>
+												<numbered/>
+												<hardbreaks/>
+												<sectlinks/>
+												<sectanchors/>
 												<generated>${project.build.directory}/asciidoc/generated</generated>
 										</attributes>
 								</configuration>
@@ -690,7 +773,7 @@
 								<executions>
 										<execution>
 												<id>output-html</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -702,7 +785,7 @@
 										</execution>
 										<execution>
 												<id>output-pdf</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -775,7 +858,9 @@
 						<plugin>
 								<groupId>org.springframework.boot</groupId>
 								<artifactId>spring-boot-maven-plugin</artifactId>
-								<version>${springboot.version}</version>
+								<!-- Temporary fix -->
+								<version>1.5.13.RELEASE</version>
+								<!-- <version>${springboot.version}</version> -->
 								<executions>
 										<execution>
 												<goals>
@@ -801,18 +886,19 @@
 						<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.16</version>
-
+								<version>2.22.1</version>
 								<executions>
 										<execution>
 												<id>integration-tests</id>
@@ -821,25 +907,38 @@
 														<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>
+
 						</plugin>
 						<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>mariadb:10.1.11</name>
+														<name>library/mariadb:10.1.11</name>
 														<alias>mariadb</alias>
 														<run>
 																<env>
@@ -862,7 +961,7 @@
 														</run>
 												</image>
 												<image>
-														<name>python:2-slim</name>
+														<name>library/python:2-slim</name>
 														<alias>python</alias>
 														<run>
 																<hostname>python</hostname>
@@ -893,6 +992,9 @@
 												<image>
 														<name>onap/clamp</name>
 														<alias>onap-clamp</alias>
+														<run>
+															<skip>true</skip>
+														</run>
 														<build>
 																<cleanup>true</cleanup>
 																<tags>
@@ -900,7 +1002,8 @@
 																		<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 -->
+																<!-- A relative path is looked up in ${project.basedir}/src/main/docker 
+																		by default -->
 																<dockerFile>Dockerfile</dockerFile>
 																<assembly>
 																		<descriptor>assembly/clamp-files.xml</descriptor>
@@ -908,9 +1011,41 @@
 																</assembly>
 														</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.logstash</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.kibana</dockerFile>
+														</build>
+												</image>
 										</images>
-										<skip>${skipITs}</skip>
 								</configuration>
+
 								<executions>
 										<execution>
 												<id>generate-images</id>
@@ -918,13 +1053,6 @@
 												<goals>
 														<goal>build</goal>
 												</goals>
-												<configuration>
-														<images>
-															<image>
-																<alias>onap-clamp</alias>
-															</image>
-														</images>
-												</configuration>
 										</execution>
 										<execution>
 												<id>push-images</id>
@@ -932,13 +1060,6 @@
 												<goals>
 														<goal>push</goal>
 												</goals>
-												<configuration>
-														<images>
-															<image>
-																<alias>onap-clamp</alias>
-															</image>
-														</images>
-												</configuration>
 										</execution>
 										<execution>
 												<id>docker-start-for-it</id>
@@ -946,17 +1067,6 @@
 												<goals>
 														<goal>start</goal>
 												</goals>
-												<configuration>
-														<skip>${skipITs}</skip>
-														<images>
-															<image>
-																<alias>mariadb</alias>
-															</image>
-															<image>
-																<alias>python</alias>
-															</image>
-														</images>
-												</configuration>
 										</execution>
 										<execution>
 												<id>docker-stop-for-it</id>
@@ -964,17 +1074,6 @@
 												<goals>
 														<goal>stop</goal>
 												</goals>
-												<configuration>
-														<skip>${skipITs}</skip>
-														<images>
-															<image>
-																<alias>mariadb</alias>
-															</image>
-															<image>
-																<alias>python</alias>
-															</image>
-														</images>
-												</configuration>
 										</execution>
 								</executions>
 						</plugin>
@@ -982,9 +1081,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>
@@ -997,6 +1097,7 @@
 												</goals>
 												<configuration>
 														<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+														<propertyName>surefireArgLine</propertyName>
 														<!-- <append>true</append> -->
 												</configuration>
 										</execution>
@@ -1008,6 +1109,7 @@
 												</goals>
 												<configuration>
 														<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+														<propertyName>failsafeArgLine</propertyName>
 														<!-- <append>true</append> -->
 												</configuration>
 										</execution>
@@ -1037,17 +1139,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>
-		<profiles>
-				<profile>
-						<id>docker</id>
-						<properties>
-								<skip.staging.artifacts>true</skip.staging.artifacts>
-								<docker.skip.build>false</docker.skip.build>
-								<docker.skip.tag>false</docker.skip.tag>
-								<docker.skip.push>false</docker.skip.push>
-						</properties>
-				</profile>
-		</profiles>
 </project>