X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ubuntu%2Fpom.xml;h=f45fb5901d7508fc7c8f43e90f1579e16dff59d4;hb=b8e5bdc6e8c6e4911d39cc576033d7d29e82af43;hp=11e564f3835482ea7f81240b90bab7ccdb8277b1;hpb=3c902a042bac562e790af9e236483908f0672110;p=ccsdk%2Fdistribution.git
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index 11e564f3..f45fb590 100644
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,11 +5,11 @@
org.onap.ccsdk.distribution
distribution-root
- 0.2.3-SNAPSHOT
+ 0.7.0-SNAPSHOT
distribution-ubuntu
- 0.2.3-SNAPSHOT
+ 0.7.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.16.5
+ 0.28.0
false
@@ -104,11 +90,11 @@
try
${basedir}/target/docker-stage
- ${basedir}/target/docker-stage/Dockerfile
+ 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}