X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fpom.xml;h=4ede3345fee0c2473740b670c725a778fbcc8358;hb=fd52d134f47a21b205e175fcc331ce8a0c0c5d45;hp=af790f023d44d44c6e4333c827cb6f9aabf2af60;hpb=439954be802b246cb0f89ee7347d167419526f9d;p=appc%2Fdeployment.git

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index af790f0..4ede334 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -3,7 +3,7 @@
 ============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
@@ -18,8 +18,6 @@ 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.
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ============LICENSE_END============================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,26 +26,29 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 	<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.6.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.2</appc.cdt.version>
+		<docker.plugin.version>0.28.0</docker.plugin.version>
 	</properties>
 
 
@@ -111,9 +112,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 								<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>
@@ -135,6 +140,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 									<includes>
 										<include>*.jks</include>
 										<include>*.p12</include>
+										<include>*keyfile</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
@@ -155,6 +161,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 									<directory>../src/main/properties</directory>
 									<includes>
 										<include>*.properties</include>
+										<include>*.csv</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
@@ -178,6 +185,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 							<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>
@@ -240,7 +248,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 										}
 										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";
@@ -257,7 +265,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 					<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>
@@ -266,7 +274,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 									<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>
@@ -353,9 +361,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 										<resource>
 											<directory>src/main/resources</directory>
 											<includes>
+												<include>keystore</include>
 												<include>*.dump</include>
 												<include>*.sh</include>
-												<include>*.cfg</include>		
+												<include>*.cfg</include>
+												<include>*.xml</include>
+												<include>*.json</include>
+												<include>*.properties</include>
 											</includes>
 											<filtering>false</filtering>
 										</resource>
@@ -377,6 +389,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 											<includes>
 												<include>*.jks</include>
 												<include>*.p12</include>
+												<include>*.keyfile</include>
 											</includes>
 											<filtering>false</filtering>
 										</resource>
@@ -397,6 +410,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 											<directory>../src/main/properties</directory>
 											<includes>
 												<include>*.properties</include>
+												<include>*.csv</include>
 											</includes>
 											<filtering>false</filtering>
 										</resource>