Upgrade ELK to 6.1.3
[clamp.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index e023994..68b80ab 100644 (file)
--- a/pom.xml
+++ b/pom.xml
   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"
-               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>2.0.0-SNAPSHOT</version>
+               <version>3.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>
@@ -49,8 +46,6 @@
            "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
 
                                <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.10.RELEASE</springboot.version>
+                               <camel.version>2.22.0</camel.version>
+                               <springboot.version>2.0.3.RELEASE</springboot.version>
 
                                <sonar.language>java</sonar.language>
                                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                                <sonar.projectVersion>${project.version}</sonar.projectVersion>
 
                                <docker.push.registry>localhost:5000</docker.push.registry>
-                               <skip.docker.build>true</skip.docker.build>
-                               <skip.docker.push>true</skip.docker.push>
+                               <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>
+                               <python.http.proxy.param/>
+                               <tomcat.version>8.5.32</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>
                </dependencyManagement>
 
                <dependencies>
-                               <!-- Swagger requires at least v20 and policy is bringing version 14 -->
                                <dependency>
-                                       <groupId>com.google.guava</groupId>
-                                       <artifactId>guava</artifactId>
-                                       <version>${guava.version}</version>
+                                               <groupId>com.att.eelf</groupId>
+                                               <artifactId>eelf-core</artifactId>
+                                               <version>${eelf.core.version}</version>
                                </dependency>
                                <dependency>
-                                       <groupId>io.swagger.core.v3</groupId>
-                                       <artifactId>swagger-jaxrs2</artifactId>
-                                       <version>${swagger.jaxrs2.version}</version>
+                                               <groupId>org.codehaus.janino</groupId>
+                                               <artifactId>janino</artifactId>
+                                               <version>3.0.8</version>
                                </dependency>
                                <dependency>
-                                               <groupId>com.att.eelf</groupId>
-                                               <artifactId>eelf-core</artifactId>
-                                               <version>${eelf.core.version}</version>
+                                               <groupId>org.apache.tomcat.embed</groupId>
+                                               <artifactId>tomcat-embed-core</artifactId>
+                                               <version>${tomcat.version}</version>
+                               </dependency>
+                               <dependency>
+                                               <groupId>org.apache.tomcat.embed</groupId>
+                                               <artifactId>tomcat-embed-el</artifactId>
+                                               <version>${tomcat.version}</version>
+                               </dependency>
+                               <dependency>
+                                               <groupId>org.apache.tomcat.embed</groupId>
+                                               <artifactId>tomcat-embed-websocket</artifactId>
+                                               <version>${tomcat.version}</version>
+                               </dependency>
+                               <dependency>
+                                               <groupId>org.apache.tomcat</groupId>
+                                               <artifactId>tomcat-annotations-api</artifactId>
+                                               <version>${tomcat.version}</version>
                                </dependency>
                                <!-- For CAMEL -->
                                <dependency>
                                                <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>
                                                <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>
                                </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>
                                                </exclusions>
                                </dependency>
                                <!-- Others dependencies -->
+                               <dependency>
+                                       <groupId>org.onap.aaf.authz</groupId>
+                                       <artifactId>aaf-cadi-aaf</artifactId>
+                                       <version>2.1.1</version>
+                                       <exclusions>
+                                               <exclusion>
+                                                       <groupId>javax.servlet</groupId>
+                                                       <artifactId>servlet-api</artifactId>
+                                               </exclusion>
+                                       </exclusions>
+                               </dependency>
                                <dependency>
                                                <groupId>ch.qos.logback</groupId>
                                                <artifactId>logback-core</artifactId>
                                                <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.1.0</version>
+                                               <version>1.2.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <groupId>com.google.guava</groupId>
                                                                                <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.0</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>
                                                </exclusions>
                                </dependency>
                                <dependency>
-                                               <groupId>org.onap.policy.engine</groupId>
-                                               <artifactId>PolicyEngineUtils</artifactId>
-                                               <version>1.1.0</version>
+                                               <groupId>org.onap.policy.common</groupId>
+                                               <artifactId>ONAP-Logging</artifactId>
+                                               <version>1.2.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
                                                                                <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.0</version>
+                                               <version>1.2.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
                                                </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.0</version>
+                                               <version>1.2.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
                                                </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.0</version>
+                                               <version>1.2.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
                                                <artifactId>commons-csv</artifactId>
                                                <version>1.3</version>
                                </dependency>
+                               <!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
                                <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>
+                                               <groupId>org.codehaus.plexus</groupId>
+                                               <artifactId>plexus-utils</artifactId>
+                                               <version>3.0.24</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>
+                                               <groupId>commons-fileupload</groupId>
+                                               <artifactId>commons-fileupload</artifactId>
+                                               <version>1.3.3</version>
                                </dependency>
                                <dependency>
-                                       <groupId>commons-fileupload</groupId>
-                                       <artifactId>commons-fileupload</artifactId>
-                                       <version>1.3.3</version>
+                                               <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>org.jboss.spec.javax.ws.rs</groupId>
-                                       <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-                                       <version>1.0.1.Final</version>
+                                               <groupId>com.google.guava</groupId>
+                                               <artifactId>guava</artifactId>
+
                                </dependency>
                                <!-- Remove the MYSQL connector and replace it by Mariadb -->
                                <dependency>
                                                <version>1.3.0</version>
                                </dependency>
                                <dependency>
-                                       <groupId>org.onap.sdc.sdc-tosca</groupId>
-                                       <artifactId>sdc-tosca</artifactId>
-                                       <version>1.3.3</version>
+                                               <groupId>org.onap.sdc.sdc-tosca</groupId>
+                                               <artifactId>sdc-tosca</artifactId>
+                                               <version>1.4.1</version>
+                               </dependency>
+                               <!-- TESTING -->
+                               <dependency>
+                                               <groupId>org.assertj</groupId>
+                                               <artifactId>assertj-core</artifactId>
+                                               <version>3.10.0</version>
+                                               <scope>test</scope>
+                               </dependency>
+                               <dependency>
+                                       <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-for-plugins</id>
+                                               <name>jcenter</name>
+                                               <url>http://jcenter.bintray.com</url>
+                               </pluginRepository>
+               </pluginRepositories>
                <build>
                                <finalName>clamp</finalName>
 
                                                                <filtering>false</filtering>
                                                                <targetPath>https</targetPath>
                                                </testResource>
-                                         <testResource>
+                                               <testResource>
                                                                <directory>src/test/resources/example/sdc</directory>
                                                                <includes>
                                                                                <include>**.csar</include>
                                                </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>
                                </resources>
 
                                <plugins>
+                                               <!-- Read the swagger.json file and the definition from SwaggerConfig.java; 
+                                                       generate a list of .adoc files containing the APIs info in more structured 
+                                                       way -->
+                                               <plugin>
+                                                               <groupId>io.github.swagger2markup</groupId>
+                                                               <artifactId>swagger2markup-maven-plugin</artifactId>
+                                                               <version>1.3.3</version>
+                                                               <dependencies>
+                                                                               <dependency>
+                                                                                               <groupId>io.github.swagger2markup</groupId>
+                                                                                               <artifactId>swagger2markup-import-files-ext</artifactId>
+                                                                                               <version>1.3.3</version>
+                                                                               </dependency>
+                                                                               <dependency>
+                                                                                               <groupId>io.github.swagger2markup</groupId>
+                                                                                               <artifactId>swagger2markup-spring-restdocs-ext</artifactId>
+                                                                                               <version>1.3.3</version>
+                                                                               </dependency>
+                                                               </dependencies>
+                                                               <configuration>
+                                                                               <swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
+                                                                               <outputDir>${project.build.directory}/asciidoc/generated</outputDir>
+                                                                               <config>
+                                                                                               <swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
+                                                                               </config>
+                                                               </configuration>
+                                                               <executions>
+                                                                               <execution>
+                                                                                               <phase>post-integration-test</phase>
+                                                                                               <goals>
+                                                                                                               <goal>convertSwagger2markup</goal>
+                                                                                               </goals>
+                                                                               </execution>
+                                                               </executions>
+                                               </plugin>
+
+                                               <!-- Run the generated asciidoc through Asciidoctor to generate other 
+                                                               documentation types, such as PDFs or HTML5 -->
+                                               <plugin>
+                                                               <groupId>org.asciidoctor</groupId>
+                                                               <artifactId>asciidoctor-maven-plugin</artifactId>
+                                                               <version>1.5.6</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/>
+                                                                                               <hardbreaks/>
+                                                                                               <sectlinks/>
+                                                                                               <sectanchors/>
+                                                                                               <generated>${project.build.directory}/asciidoc/generated</generated>
+                                                                               </attributes>
+                                                               </configuration>
+
+                                                               <executions>
+                                                                               <execution>
+                                                                                               <id>output-html</id>
+                                                                                               <phase>post-integration-test</phase>
+                                                                                               <goals>
+                                                                                                               <goal>process-asciidoc</goal>
+                                                                                               </goals>
+                                                                                               <configuration>
+                                                                                                               <backend>html5</backend>
+                                                                                                               <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+                                                                                                               <outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory>
+                                                                                               </configuration>
+                                                                               </execution>
+                                                                               <execution>
+                                                                                               <id>output-pdf</id>
+                                                                                               <phase>post-integration-test</phase>
+                                                                                               <goals>
+                                                                                                               <goal>process-asciidoc</goal>
+                                                                                               </goals>
+                                                                                               <configuration>
+                                                                                                               <backend>pdf</backend>
+                                                                                                               <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+                                                                                               </configuration>
+                                                                               </execution>
+                                                               </executions>
+                                               </plugin>
                                                <plugin>
                                                                <groupId>org.codehaus.groovy.maven</groupId>
                                                                <artifactId>gmaven-plugin</artifactId>
                                                <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>
                                                                                <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
                                                                </configuration>
                                                </plugin>
-                                               <plugin>
-                                                               <groupId>com.spotify</groupId>
-                                                               <artifactId>docker-maven-plugin</artifactId>
-                                                               <version>1.0.0</version>
-                                                               <configuration>
-                                                                               <imageName>onap/clamp</imageName>
-                                                                               <dockerDirectory>src/main/docker</dockerDirectory>
-                                                                               <serverId>docker-hub</serverId>
-                                                                               <imageTags>
-                                                                                               <imageTag>latest</imageTag>
-                                                                                               <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>
-                                                                                               <imageTag>${project.docker.latesttag.version}</imageTag>
-                                                                               </imageTags>
-                                                                               <forceTags>true</forceTags>
-                                                                               <resources>
-                                                                                               <resource>
-                                                                                                               <targetPath>/</targetPath>
-                                                                                                               <directory>${project.build.directory}</directory>
-                                                                                                               <include>${project.build.finalName}.jar</include>
-                                                                                               </resource>
-                                                                                               <resource>
-                                                                                                               <targetPath>/</targetPath>
-                                                                                                               <directory>${project.build.directory}</directory>
-                                                                                                               <include>etc/config/**</include>
-                                                                                               </resource>
-                                                                                               <resource>
-                                                                                                               <targetPath>/</targetPath>
-                                                                                                               <directory>${project.build.directory}</directory>
-                                                                                                               <include>etc/keystore/**</include>
-                                                                                               </resource>
-                                                                               </resources>
-                                                               </configuration>
-                                                               <executions>
-                                                                               <execution>
-                                                                                               <id>build-image</id>
-                                                                                               <phase>package</phase>
-                                                                                               <goals>
-                                                                                                               <goal>build</goal>
-                                                                                               </goals>
-                                                                                               <configuration>
-                                                                                                               <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-                                                                                                               <buildArgs>
-                                                                                                                               <http_proxy>${env.HTTP_PROXY}</http_proxy>
-                                                                                                                               <https_proxy>${env.HTTPS_PROXY}</https_proxy>
-                                                                                                               </buildArgs>
-                                                                                               </configuration>
-                                                                               </execution>
 
-                                                                               <execution>
-                                                                                               <id>tag-image-latest-timestamp</id>
-                                                                                               <phase>package</phase>
-                                                                                               <goals>
-                                                                                                               <goal>tag</goal>
-                                                                                               </goals>
-                                                                                               <configuration>
-                                                                                                               <image>onap/clamp</image>
-                                                                                                               <newName>${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}</newName>
-                                                                                                               <skipDockerTag>${skip.docker.push}</skipDockerTag>
-                                                                                               </configuration>
-                                                                               </execution>
-                                                                               <execution>
-                                                                                               <id>push-image-latest-timestamp</id>
-                                                                                               <phase>deploy</phase>
-                                                                                               <goals>
-                                                                                                               <goal>push</goal>
-                                                                                               </goals>
-                                                                                               <configuration>
-                                                                                                               <imageName>${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}</imageName>
-                                                                                                               <skipDockerPush>${skip.docker.push}</skipDockerPush>
-                                                                                               </configuration>
-                                                                               </execution>
-                                                                               <execution>
-                                                                                               <id>tag-image-latest</id>
-                                                                                               <phase>package</phase>
-                                                                                               <goals>
-                                                                                                               <goal>tag</goal>
-                                                                                               </goals>
-                                                                                               <configuration>
-                                                                                                               <image>onap/clamp</image>
-                                                                                                               <newName>${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}</newName>
-                                                                                                               <skipDockerTag>${skip.docker.push}</skipDockerTag>
-                                                                                               </configuration>
-                                                                               </execution>
-                                                                               <execution>
-                                                                                               <id>push-image-latest</id>
-                                                                                               <phase>deploy</phase>
-                                                                                               <goals>
-                                                                                                               <goal>push</goal>
-                                                                                               </goals>
-                                                                                               <configuration>
-                                                                                                               <imageName>${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}</imageName>
-                                                                                                               <skipDockerPush>${skip.docker.push}</skipDockerPush>
-                                                                                               </configuration>
-                                                                               </execution>
-                                                                               <execution>
-                                                                                               <id>tag-image</id>
-                                                                                               <phase>package</phase>
-                                                                                               <goals>
-                                                                                                               <goal>tag</goal>
-                                                                                               </goals>
-                                                                                               <configuration>
-                                                                                                               <image>onap/clamp</image>
-                                                                                                               <newName>${docker.push.registry}/onap/clamp:latest</newName>
-                                                                                                               <skipDockerTag>${skip.docker.push}</skipDockerTag>
-                                                                                               </configuration>
-                                                                               </execution>
-                                                                               <execution>
-                                                                                               <id>push-image</id>
-                                                                                               <phase>deploy</phase>
-                                                                                               <goals>
-                                                                                                               <goal>push</goal>
-                                                                                               </goals>
-                                                                                               <configuration>
-                                                                                                               <imageName>${docker.push.registry}/onap/clamp:latest</imageName>
-                                                                                                               <skipDockerPush>${skip.docker.push}</skipDockerPush>
-                                                                                               </configuration>
-                                                                               </execution>
-                                                               </executions>
-                                               </plugin>
                                                <plugin>
                                                                <groupId>org.apache.maven.plugins</groupId>
                                                                <artifactId>maven-surefire-plugin</artifactId>
                                                <plugin>
                                                                <groupId>org.apache.maven.plugins</groupId>
                                                                <artifactId>maven-failsafe-plugin</artifactId>
-                                                               <version>2.16</version>
+                                                               <version>2.17</version>
 
                                                                <executions>
                                                                                <execution>
                                                <plugin>
                                                                <groupId>io.fabric8</groupId>
                                                                <artifactId>docker-maven-plugin</artifactId>
-                                                               <version>0.16.5</version>
+                                                               <version>0.26.0</version>
                                                                <configuration>
                                                                                <verbose>true</verbose>
                                                                                <apiVersion>1.23</apiVersion>
                                                                                <images>
                                                                                                <image>
-                                                                                                               <name>mariadb:10.1.11</name>
+                                                                                                               <name>library/mariadb:10.1.11</name>
                                                                                                                <alias>mariadb</alias>
                                                                                                                <run>
                                                                                                                                <env>
                                                                                                                </run>
                                                                                                </image>
                                                                                                <image>
-                                                                                                               <name>python:2-slim</name>
+                                                                                                               <name>library/python:2-slim</name>
                                                                                                                <alias>python</alias>
                                                                                                                <run>
                                                                                                                                <hostname>python</hostname>
                                                                                                                                </cmd>
                                                                                                                </run>
                                                                                                </image>
+                                                                                               <image>
+                                                                                                               <name>onap/clamp</name>
+                                                                                                               <alias>onap-clamp</alias>
+                                                                                                               <run>
+                                                                                                                       <skip>true</skip>
+                                                                                                               </run>
+                                                                                                               <build>
+                                                                                                                               <cleanup>true</cleanup>
+                                                                                                                               <tags>
+                                                                                                                                               <tag>latest</tag>
+                                                                                                                                               <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                                                                                                                               <tag>${project.docker.latesttag.version}</tag>
+                                                                                                                               </tags>
+                                                                                                                               <!-- A relative path is looked up in ${project.basedir}/src/main/docker 
+                                                                                                                                               by default -->
+                                                                                                                               <dockerFile>Dockerfile</dockerFile>
+                                                                                                                               <assembly>
+                                                                                                                                               <descriptor>assembly/clamp-files.xml</descriptor>
+                                                                                                                                               <name>onap-clamp</name>
+                                                                                                                               </assembly>
+                                                                                                               </build>
+                                                                                               </image>
                                                                                </images>
-                                                                               <skip>${skipITs}</skip>
                                                                </configuration>
 
                                                                <executions>
+                                                                               <execution>
+                                                                                               <id>generate-images</id>
+                                                                                               <phase>install</phase>
+                                                                                               <goals>
+                                                                                                               <goal>build</goal>
+                                                                                               </goals>
+                                                                               </execution>
+                                                                               <execution>
+                                                                                               <id>push-images</id>
+                                                                                               <phase>deploy</phase>
+                                                                                               <goals>
+                                                                                                               <goal>push</goal>
+                                                                                               </goals>
+                                                                               </execution>
                                                                                <execution>
                                                                                                <id>docker-start-for-it</id>
                                                                                                <phase>pre-integration-test</phase>
                                                                                                <goals>
                                                                                                                <goal>start</goal>
                                                                                                </goals>
-                                                                                               <configuration>
-                                                                                                               <skip>${skipITs}</skip>
-                                                                                               </configuration>
                                                                                </execution>
                                                                                <execution>
                                                                                                <id>docker-stop-for-it</id>
                                                                                                <goals>
                                                                                                                <goal>stop</goal>
                                                                                                </goals>
-                                                                                               <configuration>
-                                                                                                               <skip>${skipITs}</skip>
-                                                                                               </configuration>
                                                                                </execution>
                                                                </executions>
                                                </plugin>
                                                </plugin>
                                </plugins>
                </build>
-               <profiles>
-                               <profile>
-                                               <id>docker</id>
-                                               <properties>
-                                                               <skip.staging.artifacts>true</skip.staging.artifacts>
-                                                               <skip.docker.build>false</skip.docker.build>
-                                                               <skip.docker.tag>false</skip.docker.tag>
-                                                               <skip.docker.push>false</skip.docker.push>
-                                               </properties>
-                               </profile>
-               </profiles>
 </project>