X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fueb-listener%2Fpom.xml;h=828940c9bc1874186fa52c99377510c7b8246022;hb=5eadcba086124f49b7cdcc53db4b4622dc2ebd93;hp=80c31693c10bbebd7307124c863c858716562cb4;hpb=83bf86e406f5d22d1c4ab5cb94651d50ea82e25a;p=sdnc%2Foam.git

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 80c31693..828940c9 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
@@ -17,10 +19,11 @@
 
     <properties>
         <image.name>onap/sdnc-ueb-listener-image</image.name>
-        <sdnc.project.version>${project.version}</sdnc.project.version>    
+        <sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-	    <docker.push.phase>deploy</docker.push.phase>
+        <docker.push.phase>deploy</docker.push.phase>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
@@ -39,22 +42,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                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'];
-                            </source>
+                            <source>${basedir}/../TagVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
@@ -209,9 +197,9 @@
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                            <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -228,7 +216,7 @@
 
                             <execution>
                                 <id>push-images</id>
-                                <!--<phase>deploy</phase>-->
+                                <!--<phase>deploy</phase> -->
                                 <phase>${docker.push.phase}</phase>
                                 <goals>
                                     <goal>build</goal>