X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fansible-server%2Fpom.xml;h=93ad51912b12f02a769ab958d804dde8671cde7b;hb=03c6d7620f636a5ab23c91c4aa2d07c5a24b3b84;hp=3c22fd7a49609b9dd4fcb5a9190a97d941152e8d;hpb=80020fa702bd05f04d5b1f6b5fc4b33c3a9d62af;p=sdnc%2Foam.git
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 3c22fd7a..93ad5191 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -4,13 +4,13 @@
org.onap.ccsdk.parent
odlparent-lite
- 1.2.1-SNAPSHOT
+ 2.0.0-SNAPSHOT
4.0.0
pom
org.onap.sdnc.oam
installation-ansible-server
- 1.5.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
sdnc-oam :: installation :: ${project.artifactId}
Creates ansible-server Docker container
@@ -18,7 +18,8 @@
onap/sdnc-ansible-server-image
${project.version}
- 0.4-STAGING-latest
+ ${maven.build.timestamp}
+ 0.7-STAGING-latest
${https_proxy}
yyyyMMdd'T'HHmmss'Z'
@@ -36,22 +37,7 @@
execute
-
- println project.properties['sdnc.project.version'];
- def versionArray;
- if ( project.properties['sdnc.project.version'] != null ) {
- versionArray = project.properties['sdnc.project.version'].split('\\.');
- }
-
- if (project.properties['sdnc.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}/../TagVersion.groovy
@@ -93,7 +79,7 @@
io.fabric8
docker-maven-plugin
- 0.16.5
+ 0.28.0
false
@@ -102,11 +88,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}