X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=5de715c49c3e862bef7ccff7c860c30a1950aa60;hb=bf4593cc3c4f3c433b2021af917123b93d9feb0e;hp=59084ae5080659b0ee0641dc8ff0a6c44a7e1f06;hpb=413da52a6cfd376abea7f1c1342edfd105c37ff4;p=dmaap%2Fkafka11aaf.git diff --git a/pom.xml b/pom.xml index 59084ae..5de715c 100644 --- a/pom.xml +++ b/pom.xml @@ -397,15 +397,11 @@ println project.properties['ver']; - def versionArray; - if ( project.properties['ver'] != null ) { - versionArray = project.properties['ver'].split('\\.'); - } if ( project.properties['ver'].endsWith("-SNAPSHOT") ) { project.properties['dockertag1']=project.properties['ver'] + "-latest"; project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp']; } else { - project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest"; project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp']; } println 'docker tag 1: ' + project.properties['dockertag1'];