From: Patrick Brady <pb071s@att.com>
Date: Mon, 27 Nov 2017 23:17:55 +0000 (-0800)
Subject: Add appc version properties
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=efc8ecc72f7069e2c8969eff5b6cc60b125905f2;p=appc%2Fdeployment.git

Add appc version properties

(cherry-pick from master)

When we increment the version of the deployment project, builds
will currently break since the version will be one ahead of the
released version of appc.

Adding properties to define the version of appc to download.
Also adding a script to determine when snapshot or release version
should be used.

Change-Id: I8e98dbc8ca79e0ec6a02fb011c17053c728c351d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: CIMAN-120
---

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index db6b673..c1885a1 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -19,7 +19,8 @@
 
 	<properties>
 		<image.name>openecomp/appc-image</image.name>
-		<appc.version>${project.version}</appc.version>
+		<appc.release.version>1.2.0</appc.release.version>
+		<appc.snapshot.version>1.2.1-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>
@@ -216,9 +217,11 @@
 										if ( project.properties['ver'].endsWith("-amsterdam") ) {
 										project.properties['dockertag1']=project.properties['ver'] + "-latest";
 										project.properties['dockertag2']="latest";
+										project.properties['appc.version']=project.properties['appc.snapshot.version'];
 										} else {
 										project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 										project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+										project.properties['appc.version']=project.properties['appc.release.version'];
 										}
 										println 'docker tag 1: ' + project.properties['dockertag1'];
 										println 'docker tag 2: ' + project.properties['dockertag2'];