X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ms%2Fsdclistener%2Fdistribution%2Fpom.xml;h=3dd656ff243403407f20f8c31ec6765be060191b;hb=61dcd85034ea44b421dfe6a74e46fdc2a749f5af;hp=ec02cfb5c0d7ac9460d8dd4aadedc37888ee5d7c;hpb=8edec22767a6fdb055af92ef815e374987ed8d22;p=ccsdk%2Fcds.git

diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml
index ec02cfb5c..3dd656ff2 100755
--- a/ms/sdclistener/distribution/pom.xml
+++ b/ms/sdclistener/distribution/pom.xml
@@ -20,33 +20,25 @@
 
     <parent>
         <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>sdclistener-parent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
-    <artifactId>distribution</artifactId>
+    <artifactId>sdclistener-distribution</artifactId>
     <packaging>pom</packaging>
 
-    <name>SDC Listener Distribution</name>
+    <name>MS SDC Listener - Distribution</name>
 
     <properties>
-        <assembly.id>maven</assembly.id>
-        <name.space>org.onap.ccsdk.cds</name.space>
         <serviceArtifactName>sdclistener</serviceArtifactName>
         <image.name>onap/ccsdk-sdclistener</image.name>
-        <!--disabled for now to mirror #85964 https://gerrit.onap.org/r/#/c/85964/2/ms/command-executor/pom.xml-->
-        <!--<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>-->
-        <docker.push.phase>deploy</docker.push.phase>
-        <docker.verbose>true</docker.verbose>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-            <artifactId>application</artifactId>
+            <artifactId>sdclistener-application</artifactId>
         </dependency>
     </dependencies>
 
@@ -144,7 +136,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.26.1</version>
+                        <version>0.34.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -152,6 +144,7 @@
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
@@ -161,19 +154,12 @@
                                     </build>
                                 </image>
                             </images>
-                            <verbose>true</verbose>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>generate-images</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>push-images</id>
-                                <phase>${docker.push.phase}</phase>
+                                <id>build-push-images</id>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>