============LICENSE_START==========================================
ONAP : APPC
===================================================================
-Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
<parent>
<groupId>org.onap.appc.deployment</groupId>
<artifactId>installation</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.appc.deployment</groupId>
<artifactId>installation-appc</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.5-SNAPSHOT</version>
<name>Installation - APPC Docker</name>
<description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
<properties>
<image.name>onap/appc-image</image.name>
- <appc.release.version>1.4.0</appc.release.version>
- <appc.snapshot.version>1.4.1-SNAPSHOT</appc.snapshot.version>
+ <appc.release.version>1.6.4</appc.release.version>
+ <appc.snapshot.version>1.6.5-SNAPSHOT</appc.snapshot.version>
<!--This version will be over-ridden by jenkins
injecting the version.properties variable file during docker build-->
<appc.docker.staging.version>1.0.0</appc.docker.staging.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<!--Determines the version of the cdt-proxy-service to download and install-->
- <appc.cdt.version>1.4.0</appc.cdt.version>
+ <appc.cdt.version>1.6.2</appc.cdt.version>
+ <docker.plugin.version>0.28.0</docker.plugin.version>
</properties>
<resource>
<directory>src/main/resources</directory>
<includes>
+ <include>keystore</include>
<include>*.dump</include>
<include>*.sh</include>
<include>*.cfg</include>
<include>*.xml</include>
+ <include>*.json</include>
+ <include>*.properties</include>
</includes>
<filtering>false</filtering>
</resource>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>${docker.plugin.version}</version>
<inherited>false</inherited>
<configuration>
<images>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${dockertag1}</tag>
<tag>${dockertag2}</tag>
<resource>
<directory>src/main/resources</directory>
<includes>
+ <include>keystore</include>
<include>*.dump</include>
<include>*.sh</include>
<include>*.cfg</include>
<include>*.xml</include>
+ <include>*.json</include>
+ <include>*.properties</include>
</includes>
<filtering>false</filtering>
</resource>