X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fdmaap-listener%2Fpom.xml;h=e25f6f164c339264d73dc12470db4ed3d6f49e23;hb=03c6d7620f636a5ab23c91c4aa2d07c5a24b3b84;hp=d0c235f5329b66cb17385be4d5d1fc291adc9669;hpb=0e1fcbcd4e73fc64f21b5a29bda4cf106df7154d;p=sdnc%2Foam.git
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index d0c235f5..e25f6f16 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/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-dmaap-listener
- 1.5.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
sdnc-oam :: installation :: ${project.artifactId}
Creates dmaap-listener Docker container
@@ -18,7 +18,8 @@
onap/sdnc-dmaap-listener-image
${project.version}
- 0.4-STAGING-latest
+ ${maven.build.timestamp}
+ 0.7-STAGING-latest
${https_proxy}
yyyyMMdd'T'HHmmss'Z'
@@ -38,22 +39,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
@@ -208,9 +194,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}