X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=517ff34116cf7f6567d094e92f107b53eae64248;hb=refs%2Fheads%2Fdublin;hp=5a9fad73d344f647a9cf504609e56daf118076c0;hpb=3df350aec6c16aad332ca5aca3c7e21b9e7bf036;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 5a9fad73..517ff341 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.0.5-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,33 +61,89 @@
 				<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.20.1</camel.version>
-				<springboot.version>1.5.14.RELEASE</springboot.version>
+				<camel.version>2.23.2</camel.version>
+				<springboot.version>2.1.4.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>
 				<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>9.0.16</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>
@@ -108,9 +163,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>
@@ -134,24 +195,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>
@@ -175,11 +239,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>
@@ -201,6 +285,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>
@@ -213,25 +301,53 @@
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-servlet-starter</artifactId>
 				</dependency>
+				<dependency>
+						<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>
 						<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>
 						<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>
 						<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>
@@ -242,7 +358,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>
@@ -255,11 +371,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>
@@ -290,6 +410,7 @@
 				<dependency>
 						<groupId>com.googlecode.json-simple</groupId>
 						<artifactId>json-simple</artifactId>
+						<version>1.1.1</version>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.commons</groupId>
@@ -323,20 +444,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>
@@ -366,31 +477,44 @@
 										<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>com.fasterxml.jackson.core</groupId>
+									<artifactId>jackson-databind</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>
@@ -404,28 +528,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>
-								<exclusion>
-										<groupId>com.h2database</groupId>
-										<artifactId>h2</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>
@@ -442,9 +550,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>
@@ -461,9 +569,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>
@@ -490,11 +598,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>
@@ -503,7 +606,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>
@@ -520,38 +623,23 @@
 				<dependency>
 						<groupId>org.onap.sdc.sdc-tosca</groupId>
 						<artifactId>sdc-tosca</artifactId>
-						<version>1.3.0</version>
-				</dependency>
-				<!-- To generate Swagger.json, swagger.html and swagger.pdf -->
-				<dependency>
-						<groupId>io.springfox</groupId>
-						<artifactId>springfox-swagger2</artifactId>
-						<version>2.4.0</version>
-						<scope>test</scope>
+						<version>1.5.1</version>
 				</dependency>
+				<!-- TESTING -->
 				<dependency>
-						<groupId>io.github.robwin</groupId>
-						<artifactId>assertj-swagger</artifactId>
-						<version>0.2.0</version>
+						<groupId>org.assertj</groupId>
+						<artifactId>assertj-core</artifactId>
+						<version>3.10.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>
-						<snapshots>
-								<enabled>false</enabled>
-						</snapshots>
-						<id>jcenter-releases</id>
-						<name>jcenter</name>
-						<url>http://jcenter.bintray.com</url>
-				</pluginRepository>
-		</pluginRepositories>
+
 		<build>
 				<finalName>clamp</finalName>
 
@@ -580,11 +668,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>
@@ -596,43 +712,52 @@
 				</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>
-						</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>
 
-						<!-- 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>
+						<!-- 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.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>
@@ -644,7 +769,7 @@
 								</configuration>
 								<executions>
 										<execution>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>convertSwagger2markup</goal>
 												</goals>
@@ -652,23 +777,18 @@
 								</executions>
 						</plugin>
 
-						<!-- Run the generated asciidoc through Asciidoctor to generate other 
+						<!-- 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.3</version>
+								<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>
-										<dependency>
-												<groupId>org.jruby</groupId>
-												<artifactId>jruby-complete</artifactId>
-												<version>1.7.21</version>
-										</dependency>
 								</dependencies>
 								<configuration>
 										<sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
@@ -677,10 +797,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>
@@ -688,7 +808,7 @@
 								<executions>
 										<execution>
 												<id>output-html</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -700,7 +820,7 @@
 										</execution>
 										<execution>
 												<id>output-pdf</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -767,6 +887,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>
 
@@ -785,34 +921,23 @@
 										</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.16</version>
-
+								<version>2.22.1</version>
 								<executions>
 										<execution>
 												<id>integration-tests</id>
@@ -821,25 +946,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.3.12</name>
 														<alias>mariadb</alias>
 														<run>
 																<env>
@@ -862,7 +1000,7 @@
 														</run>
 												</image>
 												<image>
-														<name>python:2-slim</name>
+														<name>library/python:2-slim</name>
 														<alias>python</alias>
 														<run>
 																<hostname>python</hostname>
@@ -893,6 +1031,9 @@
 												<image>
 														<name>onap/clamp</name>
 														<alias>onap-clamp</alias>
+														<run>
+															<skip>true</skip>
+														</run>
 														<build>
 																<cleanup>true</cleanup>
 																<tags>
@@ -900,7 +1041,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 +1050,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>
@@ -932,9 +1106,6 @@
 												<goals>
 														<goal>start</goal>
 												</goals>
-												<configuration>
-														<skip>${skipITs}</skip>
-												</configuration>
 										</execution>
 										<execution>
 												<id>docker-stop-for-it</id>
@@ -942,9 +1113,6 @@
 												<goals>
 														<goal>stop</goal>
 												</goals>
-												<configuration>
-														<skip>${skipITs}</skip>
-												</configuration>
 										</execution>
 								</executions>
 						</plugin>
@@ -952,9 +1120,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>
@@ -967,6 +1136,7 @@
 												</goals>
 												<configuration>
 														<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+														<propertyName>surefireArgLine</propertyName>
 														<!-- <append>true</append> -->
 												</configuration>
 										</execution>
@@ -978,6 +1148,7 @@
 												</goals>
 												<configuration>
 														<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+														<propertyName>failsafeArgLine</propertyName>
 														<!-- <append>true</append> -->
 												</configuration>
 										</execution>
@@ -1007,17 +1178,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>