X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=saltstack-server%2Fpom.xml;h=92a73756db158ec55653379352ce68848fc743d3;hb=428403f72cd97df8bdded8dadb624cd01dde459a;hp=019fcef7fec88a0b0199dd15625be4f533f6e4e6;hpb=8ba2cee45f88c64d096dbbb29e73741403f747d1;p=ccsdk%2Fdistribution.git
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index 019fcef7..92a73756 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,11 +5,11 @@
org.onap.ccsdk.distribution
distribution-root
- 0.4.1-SNAPSHOT
+ 0.5.0-SNAPSHOT
saltstack-server
- 0.4.1-SNAPSHOT
+ 0.5.0-SNAPSHOT
pom
ccsdk-distribution :: saltstack-server
@@ -18,6 +18,7 @@
onap/ccsdk-saltstack-server-image
${project.version}
+ ${maven.build.timestamp}
@@ -33,23 +34,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
@@ -103,9 +88,9 @@
${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}