From: sunil unnava <sunil.unnava@att.com>
Date: Thu, 21 Feb 2019 14:55:58 +0000 (-0500)
Subject: update docker tag generation
X-Git-Tag: 1.1.11~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cca85abfb66e0c280eff5ed2c7570941c2ed423e;p=dmaap%2Fmessagerouter%2Fmessageservice.git

update docker tag generation

Issue-ID: DMAAP-1042
Change-Id: I883c5629f5f84bd742d23f24e0442cfb2d012ffc
Signed-off-by: sunil unnava <sunil.unnava@att.com>
---

diff --git a/pom.xml b/pom.xml
index de92696..2a2956e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -749,15 +749,11 @@
                                     </properties>
                                     <source>
                                         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'];