X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=6990dcae917bd71e04958b8312d2a75b55480000;hb=30cece48b7e8acc218f95f2593cabc3e04b03bc5;hp=21a0c04aa1b0cbdb5e48d38fbe1040023661da40;hpb=b4f7cb6d61094a770aed1d886303cd5d16091389;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 21a0c04a..6990dcae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP CLAMP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@
   limitations under the License.
   ============LICENSE_END============================================
   ===================================================================
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,37 +26,35 @@
 		<modelVersion>4.0.0</modelVersion>
 		<groupId>org.onap.clamp</groupId>
 		<artifactId>clds</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 		<name>clamp</name>
 
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 		</parent>
 
 		<description>
-           This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code.
+           This project build the ONAP CLAMP JAR that contains CLAMP back-end code and its UI part.
 
            By Default "mvn clean install" command will execute also the unit tests
            and the integration tests. The integration tests require a docker engine running.
 
-           If you want to skip the intergation test you can by doing:
+           If you want to skip the integration test you can by doing:
            "mvn clean install -DskipITs=true"
 
            For Spring it's possible to specify the application.properties location
            "mvn clean install -Dspring.config.location=classpath:application-test.properties"
 
            The application.properties contains the location of the CLAMP parameters files:
-				- org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties
-				- org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties
 				- org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
 				- org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
-           
-    </description>
+
+		</description>
 
 		<properties>
-				<maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
+				<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 				<clamp.project.version>${project.version}</clamp.project.version>
 				<clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
 				<maven.compiler.source>1.8</maven.compiler.source>
@@ -66,12 +63,15 @@
 				<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 				<docker.mariadb.port.host>3306</docker.mariadb.port.host>
-				<sdk.java.common.logging>0.0.3-oss</sdk.java.common.logging>
+				<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>
-				<csi.logging>6.1.0.6-oss</csi.logging>
-				<sdk.camel.rest>6.2.0.6-oss</sdk.camel.rest>
-				<sdk.camunda.core>6.1.0.3-oss</sdk.camunda.core>
+
+				<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>
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -85,6 +85,7 @@
 				<skip.docker.build>true</skip.docker.build>
 				<skip.docker.push>true</skip.docker.push>
 				<skip.staging.artifacts>false</skip.staging.artifacts>
+				<python.http.proxy.param></python.http.proxy.param>
 		</properties>
 
 		<distributionManagement>
@@ -141,15 +142,31 @@
 						<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>
 				<dependencies>
+						<!-- Spring Boot BOM -->
 						<dependency>
-								<!-- Import dependency management from Spring Boot -->
 								<groupId>org.springframework.boot</groupId>
 								<artifactId>spring-boot-dependencies</artifactId>
-								<version>1.4.1.RELEASE</version>
+								<version>${springboot.version}</version>
+								<type>pom</type>
+								<scope>import</scope>
+						</dependency>
+						<!-- Camel BOM -->
+						<dependency>
+								<groupId>org.apache.camel</groupId>
+								<artifactId>camel-spring-boot-dependencies</artifactId>
+								<version>${camel.version}</version>
 								<type>pom</type>
 								<scope>import</scope>
 						</dependency>
@@ -158,120 +175,111 @@
 
 		<dependencies>
 				<dependency>
-						<groupId>commons-io</groupId>
-						<artifactId>commons-io</artifactId>
-						<version>2.6</version>
+						<groupId>com.att.eelf</groupId>
+						<artifactId>eelf-core</artifactId>
+						<version>${eelf.core.version}</version>
 				</dependency>
+				<!-- For CAMEL -->
 				<dependency>
-						<groupId>com.googlecode.json-simple</groupId>
-						<artifactId>json-simple</artifactId>
-						<version>1.1</version>
+						<groupId>org.apache.camel</groupId>
+						<artifactId>camel-spring-boot-starter</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>commons-vfs2</artifactId>
-						<version>2.0</version>
+						<groupId>org.apache.camel</groupId>
+						<artifactId>camel-jaxb-starter</artifactId>
 				</dependency>
-
 				<dependency>
-						<groupId>org.springframework.security</groupId>
-						<artifactId>spring-security-test</artifactId>
-
-						<scope>test</scope>
+						<groupId>org.apache.camel</groupId>
+						<artifactId>camel-servlet-starter</artifactId>
 				</dependency>
-
-
-				<!-- Dependencies of parent pom start -->
 				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-common-logging</artifactId>
-						<version>${sdk.java.common.logging}</version>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-tomcat</artifactId>
-						<scope>compile</scope>
-				</dependency>
+						<groupId>javax.xml.bind</groupId>
+						<artifactId>jaxb-api</artifactId>
+						<version>2.3.0</version>
+				</dependency> 
+				<!-- Spring famework -->
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-actuator</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-security</artifactId>
+						<artifactId>spring-boot-starter-web</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-test</artifactId>
-						<scope>test</scope>
+						<artifactId>spring-boot-starter-tomcat</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>joda-time</groupId>
-						<artifactId>joda-time</artifactId>
+						<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-context</artifactId>
+						<artifactId>spring-jdbc</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-api</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>javax.ws.rs</groupId>
-						<artifactId>javax.ws.rs-api</artifactId>
-						<version>2.0</version>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-starter-security</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-test</artifactId>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-starter-actuator</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>junit</groupId>
-						<artifactId>junit</artifactId>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-starter-test</artifactId>
+						<scope>test</scope>
+						<exclusions>
+								<exclusion>
+										<groupId>com.vaadin.external.google</groupId>
+										<artifactId>android-json</artifactId>
+								</exclusion>
+						</exclusions>
 				</dependency>
+				<!-- Others dependencies -->
 				<dependency>
-						<groupId>org.mockito</groupId>
-						<artifactId>mockito-all</artifactId>
-						<version>1.9.5</version>
+						<groupId>ch.qos.logback</groupId>
+						<artifactId>logback-core</artifactId>
+						<version>1.2.3</version>
 				</dependency>
 				<dependency>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-						<version>1.1.1</version>
+						<groupId>ch.qos.logback</groupId>
+						<artifactId>logback-classic</artifactId>
+						<version>1.2.3</version>
 				</dependency>
 				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-aspects</artifactId>
+						<groupId>commons-dbcp</groupId>
+						<artifactId>commons-dbcp</artifactId>
+						<version>1.4</version>
 				</dependency>
 				<dependency>
-						<groupId>com.fasterxml.jackson.core</groupId>
-						<artifactId>jackson-core</artifactId>
+						<groupId>commons-io</groupId>
+						<artifactId>commons-io</artifactId>
+						<version>2.6</version>
 				</dependency>
 				<dependency>
-						<groupId>com.fasterxml.jackson.core</groupId>
-						<artifactId>jackson-databind</artifactId>
+						<groupId>com.googlecode.json-simple</groupId>
+						<artifactId>json-simple</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-webmvc</artifactId>
+						<groupId>org.apache.commons</groupId>
+						<artifactId>commons-vfs2</artifactId>
+						<version>2.2</version>
 				</dependency>
 				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-web</artifactId>
+						<groupId>joda-time</groupId>
+						<artifactId>joda-time</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>log4j</groupId>
-						<artifactId>log4j</artifactId>
-						<version>1.2.17</version>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-api</artifactId>
 				</dependency>
 				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot</artifactId>
+						<groupId>javax.ws.rs</groupId>
+						<artifactId>javax.ws.rs-api</artifactId>
+						<version>2.0</version>
 				</dependency>
 				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-autoconfigure</artifactId>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>javax.transaction</groupId>
@@ -288,62 +296,20 @@
 						<artifactId>hibernate-annotations</artifactId>
 						<version>3.5.6-Final</version>
 				</dependency>
-				<dependency>
-						<groupId>org.apache.geronimo.specs</groupId>
-						<artifactId>geronimo-jpa_2.0_spec</artifactId>
-						<version>1.1</version>
-				</dependency>
 				<dependency>
 						<groupId>dom4j</groupId>
 						<artifactId>dom4j</artifactId>
-						<version>1.6.1</version>
-				</dependency>
-				<!-- Dependencies of parent pom end -->
-				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-camel-rest</artifactId>
-						<version>${sdk.camel.rest}</version>
 				</dependency>
 
-				<!-- Camunda Core -->
-				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-camunda-core</artifactId>
-						<version>${sdk.camunda.core}</version>
-						<exclusions>
-								<exclusion>
-										<groupId>mysql</groupId>
-										<artifactId>mysql-connector-java</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<!-- Spring Mail -->
-				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-context-support</artifactId>
-				</dependency>
-				<!-- CSI Logging -->
-				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-common-interceptors</artifactId>
-						<version>${csi.logging}</version>
-						<exclusions>
-								<exclusion>
-										<groupId>org.eclipse.jetty.orbit</groupId>
-										<artifactId>javax.servlet</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>com.att.ajsc</groupId>
-										<artifactId>ajsc-core</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<!-- CSI Logging End -->
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineAPI</artifactId>
-						<version>1.1.0</version>
+						<version>1.2.0</version>
 						<exclusions>
+								<exclusion>
+										<groupId>com.google.guava</groupId>
+										<artifactId>guava</artifactId>
+								</exclusion>
 								<exclusion>
 										<artifactId>log4j</artifactId>
 										<groupId>log4j</groupId>
@@ -356,20 +322,24 @@
 										<artifactId>apache-log4j-extras</artifactId>
 										<groupId>log4j</groupId>
 								</exclusion>
-								<exclusion>
-										<artifactId>jackson-databind</artifactId>
-										<groupId>com.fasterxml.jackson.core</groupId>
-								</exclusion>
 								<exclusion>
 										<groupId>mysql</groupId>
 										<artifactId>mysql-connector-java</artifactId>
 								</exclusion>
+								<exclusion>
+										<groupId>commons-io</groupId>
+										<artifactId>commons-io</artifactId>
+								</exclusion>
+								<exclusion>
+										<artifactId>grizzly-http</artifactId>
+										<groupId>org.glassfish.grizzly</groupId>
+								</exclusion>
 						</exclusions>
 				</dependency>
 				<dependency>
 						<groupId>org.onap.policy.common</groupId>
 						<artifactId>ONAP-Logging</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -388,7 +358,7 @@
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineUtils</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -402,12 +372,24 @@
 										<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>
 						<artifactId>policy-yaml</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -426,7 +408,7 @@
 				<dependency>
 						<groupId>org.onap.policy.drools-applications</groupId>
 						<artifactId>sdc</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -445,7 +427,7 @@
 				<dependency>
 						<groupId>org.onap.policy.drools-applications</groupId>
 						<artifactId>aai</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -461,26 +443,11 @@
 								</exclusion>
 						</exclusions>
 				</dependency>
-				<dependency>
-						<groupId>com.fasterxml.jackson.core</groupId>
-						<artifactId>jackson-databind</artifactId>
-						<version>2.6.3</version>
-				</dependency>
-				<dependency>
-						<groupId>com.fasterxml.jackson.dataformat</groupId>
-						<artifactId>jackson-dataformat-yaml</artifactId>
-						<version>2.6.3</version>
-				</dependency>
 				<dependency>
 						<groupId>org.apache.commons</groupId>
 						<artifactId>commons-csv</artifactId>
 						<version>1.3</version>
 				</dependency>
-				<dependency>
-						<groupId>org.jboss.resteasy</groupId>
-						<artifactId>resteasy-client</artifactId>
-						<version>3.0.8.Final</version>
-				</dependency>
 				<dependency>
 						<groupId>com.sun.faces</groupId>
 						<artifactId>jsf-api</artifactId>
@@ -491,14 +458,69 @@
 						<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>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
 						<groupId>org.mariadb.jdbc</groupId>
 						<artifactId>mariadb-java-client</artifactId>
-						<version>2.1.1</version>
+						<version>2.2.1</version>
 				</dependency>
-		</dependencies>
-
+				<!-- For SDC Controller -->
+				<dependency>
+						<groupId>org.onap.sdc.sdc-distribution-client</groupId>
+						<artifactId>sdc-distribution-client</artifactId>
+						<version>1.3.0</version>
+				</dependency>
+				<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>
+				</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>
+				</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>
 
@@ -507,6 +529,7 @@
 								<directory>src/test/resources</directory>
 								<excludes>
 										<exclude>**/*.jks</exclude>
+										<exclude>**/*.csar</exclude>
 								</excludes>
 								<filtering>true</filtering>
 						</testResource>
@@ -518,6 +541,14 @@
 								<filtering>false</filtering>
 								<targetPath>https</targetPath>
 						</testResource>
+					  <testResource>
+								<directory>src/test/resources/example/sdc</directory>
+								<includes>
+										<include>**.csar</include>
+								</includes>
+								<filtering>false</filtering>
+								<targetPath>example/sdc</targetPath>
+						</testResource>
 				</testResources>
 				<resources>
 						<resource>
@@ -534,6 +565,192 @@
 				</resources>
 
 				<plugins>
+						<plugin>
+							<groupId>org.codehaus.mojo</groupId>
+							<artifactId>exec-maven-plugin</artifactId>
+							<version>1.6.0</version>
+							<executions>
+								<execution>
+										<id>docker_info0</id>
+										<phase>validate</phase>
+										<goals>
+												<goal>exec</goal>
+										</goals>
+										<configuration>
+												<executable>env</executable>
+										</configuration>
+								</execution>
+									<execution>
+										<id>docker_info2</id>
+										<phase>validate</phase>
+										<goals>
+												<goal>exec</goal>
+										</goals>
+										<configuration>
+												<executable>ls</executable>
+												<arguments>
+														<argument>-latr</argument>
+														<argument>/var/run/docker.sock</argument>
+												</arguments>
+										</configuration>
+								</execution>
+
+								<execution>
+										<id>docker_info3</id>
+										<phase>validate</phase>
+										<goals>
+												<goal>exec</goal>
+										</goals>
+										<configuration>
+												<executable>cat</executable>
+												<arguments>
+														<argument>/etc/hosts</argument>
+												</arguments>
+										</configuration>
+								</execution>
+								<execution>
+										<id>docker_info4</id>
+										<phase>validate</phase>
+										<goals>
+												<goal>exec</goal>
+										</goals>
+										<configuration>
+												<executable>curl</executable>
+												<arguments>
+														<argument>-v</argument> 
+														<argument>http://127.0.0.1:2375/info</argument>
+												</arguments>
+										</configuration>
+								</execution>
+								<execution>
+										<id>docker_info5</id>
+										<phase>validate</phase>
+										<goals>
+												<goal>exec</goal>
+										</goals>
+										<configuration>
+												<executable>netstat</executable>
+												<arguments>
+														<argument>-tulnp</argument> 
+												</arguments>
+										</configuration>
+								</execution>
+							</executions>
+							
+					</plugin>
+					<!-- 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>
+
+					<!-- 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>
+						<dependencies>
+							<dependency>
+								<groupId>io.github.swagger2markup</groupId>
+								<artifactId>swagger2markup-import-files-ext</artifactId>
+								<version>1.3.1</version>
+							</dependency>
+							<dependency>
+								<groupId>io.github.swagger2markup</groupId>
+								<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
+								<version>1.3.1</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>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.3</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>
+							<sourceDocumentName>swagger.adoc</sourceDocumentName>
+							<attributes>
+								<doctype>book</doctype>
+								<toc>left</toc>
+								<toclevels>3</toclevels>
+								<numbered></numbered>
+								<hardbreaks></hardbreaks>
+								<sectlinks></sectlinks>
+								<sectanchors></sectanchors>
+								<generated>${project.build.directory}/asciidoc/generated</generated>
+							</attributes>
+						</configuration>
+
+						<executions>
+							<execution>
+								<id>output-html</id>
+								<phase>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>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>
@@ -596,7 +813,7 @@
 						<plugin>
 								<groupId>org.springframework.boot</groupId>
 								<artifactId>spring-boot-maven-plugin</artifactId>
-								<version>1.5.3.RELEASE</version>
+								<version>${springboot.version}</version>
 								<executions>
 										<execution>
 												<goals>
@@ -621,8 +838,10 @@
 						<plugin>
 								<groupId>com.spotify</groupId>
 								<artifactId>docker-maven-plugin</artifactId>
-								<version>1.0.0</version>
+								<version>1.1.0</version>
 								<configuration>
+
+								<dockerHost>http://127.0.0.1:2375</dockerHost>
 										<imageName>onap/clamp</imageName>
 										<dockerDirectory>src/main/docker</dockerDirectory>
 										<serverId>docker-hub</serverId>
@@ -801,13 +1020,42 @@
 																</ports>
 														</run>
 												</image>
+												<image>
+														<name>python:2-slim</name>
+														<alias>python</alias>
+														<run>
+																<hostname>python</hostname>
+																<volumes>
+																		<bind>
+																				<volume>${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app</volume>
+																				<volume>${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache</volume>
+																		</bind>
+																</volumes>
+																<wait>
+																		<tcp>
+																				<ports>
+																						<port>8080</port>
+																				</ports>
+																				<mode>direct</mode>
+																		</tcp>
+																		<time>120000</time>
+																</wait>
+																<ports>
+																		<port>${docker.http-cache.port.host}:8080</port>
+																</ports>
+																<workingDir>/usr/src/http-cache-app</workingDir>
+																<cmd>
+																		<shell>./start_http_cache.sh ${python.http.proxy.param} --python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
+																</cmd>
+														</run>
+												</image>
 										</images>
 										<skip>${skipITs}</skip>
 								</configuration>
 
 								<executions>
 										<execution>
-												<id>mariadb-start-for-it</id>
+												<id>docker-start-for-it</id>
 												<phase>pre-integration-test</phase>
 												<goals>
 														<goal>start</goal>
@@ -817,7 +1065,7 @@
 												</configuration>
 										</execution>
 										<execution>
-												<id>mariadb-stop-for-it</id>
+												<id>docker-stop-for-it</id>
 												<phase>post-integration-test</phase>
 												<goals>
 														<goal>stop</goal>