X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fueb-listener%2Fpom.xml;h=58178a3f4a22ae41b1c7e12948ca318c054ab3bc;hb=b6fccad86289280ef6d607ce3a70529f756d9989;hp=60c9c0294074ce70a17941106a5e0d165ecfc2ee;hpb=bc33d4b0d7469a66caf9206a6823470f5f715179;p=sdnc%2Foam.git

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 60c9c029..58178a3f 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -1,28 +1,34 @@
 <?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
+    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ueb-listener</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>Installation - ueb-listener</name>
+    <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ueb-listener Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/sdnc-ueb-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
-        <ccsdk.project.version>0.1.0-SNAPSHOT</ccsdk.project.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+        <ccsdk.docker.version>1.1.1</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+        <docker.push.phase>deploy</docker.push.phase>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
-
     <build>
         <plugins>
 
@@ -37,23 +43,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>
@@ -139,12 +129,12 @@
                         <phase>initialize</phase>
                         <configuration>
                             <artifactItems>
-                              <artifactItem>
-                                <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                                <artifactId>ueb-listener</artifactId>
-                                <type>zip</type>
-                                <version>${ccsdk.project.version}</version>
-                              </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+                                    <artifactId>ueb-listener</artifactId>
+                                    <type>zip</type>
+                                    <version>${ccsdk.sli.northbound.version}</version>
+                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener</outputDirectory>
                             <excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes>
@@ -156,8 +146,8 @@
             </plugin>
 
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <executions>
 
@@ -186,7 +176,6 @@
                 </executions>
             </plugin>
         </plugins>
-
     </build>
 
     <profiles>
@@ -197,7 +186,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.28.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -206,11 +195,11 @@
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <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>
@@ -227,7 +216,8 @@
 
                             <execution>
                                 <id>push-images</id>
-                                <phase>deploy</phase>
+                                <!--<phase>deploy</phase> -->
+                                <phase>${docker.push.phase}</phase>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>
@@ -239,7 +229,4 @@
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>