X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fpom.xml;h=11c64d5cc074a5d58e9a73aa39f987d6e1b678aa;hb=8c18854ab1e49f5b5bf76bf32c63502fc0c0d05d;hp=3711292ee2466db48b5455b397926cf0de189b21;hpb=cf10ac21a771d790a96d6bc2b7794ecc0f78a23c;p=appc%2Fdeployment.git

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index 3711292..11c64d5 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -1,30 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START==========================================
+ONAP : APPC
+===================================================================
+Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+===================================================================
+
+Unless otherwise specified, all software contained herein is licensed
+under the Apache License, Version 2.0 (the License);
+you may not use this software except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END============================================
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.onap.appc.deployment</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.appc.deployment</groupId>
 	<artifactId>installation-appc</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.6.0-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.3.0</appc.release.version>
-		<appc.snapshot.version>1.3.0-SNAPSHOT</appc.snapshot.version>
+		<appc.release.version>1.4.4</appc.release.version>
+		<appc.snapshot.version>1.5.0-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</maven.build.timestamp.format>
+		<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.5.0-SNAPSHOT</appc.cdt.version>
+		<docker.plugin.version>0.28.0</docker.plugin.version>
 	</properties>
 
 
@@ -90,6 +114,8 @@
 									<includes>
 										<include>*.dump</include>
 										<include>*.sh</include>
+										<include>*.cfg</include>
+										<include>*.xml</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
@@ -111,6 +137,7 @@
 									<includes>
 										<include>*.jks</include>
 										<include>*.p12</include>
+										<include>*keyfile</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
@@ -131,6 +158,7 @@
 									<directory>../src/main/properties</directory>
 									<includes>
 										<include>*.properties</include>
+										<include>*.csv</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
@@ -154,6 +182,7 @@
 							<executable>bash</executable>
 							<environmentVariables>
 								<APPC_VERSION>${appc.version}</APPC_VERSION>
+								<APPC_CDT_VERSION>${appc.cdt.version}</APPC_CDT_VERSION>
 								<APPC_OAM_VERSION>${project.version}</APPC_OAM_VERSION>
 								<SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
 							</environmentVariables>
@@ -216,7 +245,7 @@
 										}
 										if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
 										project.properties['dockertag1']=project.properties['ver'] + "-latest";
-										project.properties['dockertag2']="latest";
+										project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
 										project.properties['appc.version']=project.properties['appc.snapshot.version'];
 										} else {
 										project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
@@ -233,7 +262,7 @@
 					<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>
@@ -242,7 +271,7 @@
 									<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>
@@ -331,6 +360,8 @@
 											<includes>
 												<include>*.dump</include>
 												<include>*.sh</include>
+												<include>*.cfg</include>
+												<include>*.xml</include>
 											</includes>
 											<filtering>false</filtering>
 										</resource>
@@ -352,6 +383,7 @@
 											<includes>
 												<include>*.jks</include>
 												<include>*.p12</include>
+												<include>*.keyfile</include>
 											</includes>
 											<filtering>false</filtering>
 										</resource>
@@ -372,6 +404,7 @@
 											<directory>../src/main/properties</directory>
 											<includes>
 												<include>*.properties</include>
+												<include>*.csv</include>
 											</includes>
 											<filtering>false</filtering>
 										</resource>