X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ubuntu%2Fpom.xml;h=0ee414edcd7cae63d0b15a537a93213dc587cdeb;hb=643e032e9078ab47e1abb1f088aaec58a3361c7c;hp=fb655b01baf4b59a6a13283604e09169a32a0d7d;hpb=949fdb5146438b494c129a5fad5b3661c86a652a;p=ccsdk%2Fdistribution.git
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index fb655b01..0ee414ed 100644
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,11 +5,10 @@
org.onap.ccsdk.distribution
distribution-root
- 0.4.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
distribution-ubuntu
- 0.4.0-SNAPSHOT
pom
ccsdk-distribution :: ubuntu
@@ -20,15 +19,14 @@
onap/ccsdk-ubuntu-image
- ${project.version}
-
org.codehaus.groovy.maven
gmaven-plugin
+ 1.0
validate
@@ -36,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
@@ -94,38 +76,31 @@
io.fabric8
docker-maven-plugin
- 0.26.0
+ 0.34.0
false
-
${image.name}
try
- ${basedir}/target/docker-stage
+ true
+ ${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}
+ ${docker.verbose}
+ ${docker.skip.push}
- generate-images
- generate-sources
-
- build
-
-
-
-
- push-images
- deploy
+ build-push-images
build
push
@@ -133,7 +108,6 @@
-