X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ubuntu%2Fpom.xml;h=c81722b22c9eca9604a8ba8338c0476e0555656d;hb=7ff9e1fdeefcbc503a65565b55a8ea7c82f3278e;hp=fb655b01baf4b59a6a13283604e09169a32a0d7d;hpb=826075afea216b7eac6ea39dd9f9edba4aaa7c04;p=ccsdk%2Fdistribution.git
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index fb655b01..c81722b2 100644
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,11 +5,11 @@
org.onap.ccsdk.distribution
distribution-root
- 0.4.0-SNAPSHOT
+ 1.0.0-SNAPSHOT
distribution-ubuntu
- 0.4.0-SNAPSHOT
+ 1.0.0-SNAPSHOT
pom
ccsdk-distribution :: ubuntu
@@ -21,6 +21,8 @@
onap/ccsdk-ubuntu-image
${project.version}
+ ${maven.build.timestamp}
+ ${project.version}
@@ -36,23 +38,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
@@ -94,7 +80,7 @@
io.fabric8
docker-maven-plugin
- 0.26.0
+ 0.28.0
false
@@ -106,9 +92,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}