X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fpom.xml;h=1bd31681648670a3dca3cc3df4346791172e5c0a;hb=5eadcba086124f49b7cdcc53db4b4622dc2ebd93;hp=9c69c9eb1e9779cacddfa4eccc2a183ccbfa10a4;hpb=83bf86e406f5d22d1c4ab5cb94651d50ea82e25a;p=sdnc%2Foam.git

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 9c69c9eb..1bd31681 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -19,6 +19,7 @@
 	<properties>
 		<image.name>onap/sdnc-image</image.name>
 		<sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
 		<sdnc.northbound.version>1.5.0-SNAPSHOT</sdnc.northbound.version>
         <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
@@ -72,21 +73,7 @@
 							<goal>execute</goal>
 						</goals>
 						<configuration>
-							<source>
-								println project.properties['sdnc.project.version'];
-								def versionArray;
-								if ( project.properties['sdnc.project.version'] != null ) {
-								   versionArray = project.properties['sdnc.project.version'].split('\\.');
-								}
-
-								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-								    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-								} else {
-								    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-								}
-
-								println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-							</source>
+                            <source>${basedir}/../TagVersion.groovy</source>
 						</configuration>
 					</execution>
 				</executions>
@@ -106,9 +93,9 @@
 								<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
 								<dockerFile>Dockerfile</dockerFile>
 								<tags>
-									<tag>${project.version}</tag>
-									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-									<tag>${project.docker.latesttag.version}</tag>
+                                    <tag>${project.docker.latestminortag.version}</tag>
+                                    <tag>${project.docker.latestfulltag.version}</tag>
+                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
 								</tags>
 							</build>
 						</image>