X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=odlsli%2Fodlsli-ubuntu%2Fpom.xml;h=8b26b49001cf9be3e9f2bec931471f37bd2ff61f;hb=refs%2Fchanges%2F33%2F78333%2F1;hp=488692c9b68d0c264f6a5ef2efba45141244d537;hpb=8ba2cee45f88c64d096dbbb29e73741403f747d1;p=ccsdk%2Fdistribution.git
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index 488692c9..8b26b490 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -24,6 +24,7 @@
onap/ccsdk-odl-fluorine-ubuntu-image
onap/ccsdk-odlsli-image
${project.version}
+ ${maven.build.timestamp}
${project.version}
${https_proxy}
yyyyMMdd'T'HHmmss'Z'
@@ -258,22 +259,7 @@
execute
-
- println project.properties['ccsdk.project.version'];
- def versionArray;
- if (project.properties['ccsdk.project.version'] != null ) {
- versionArray = project.properties['ccsdk.project.version'].split('\\.');
- }
-
- if (project.properties['ccsdk.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'];
-
+ ${basedir}/../../src/main/scripts/TagVersion.groovy
@@ -513,9 +499,9 @@
${basedir}/target/docker-stage
${basedir}/target/docker-stage/Dockerfile
- ${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.docker.latesttag.version}
+ ${project.docker.latestminortag.version}
+ ${project.docker.latestfulltag.version}
+ ${project.docker.latesttagtimestamp.version}