adding execution for generation docker images

[ccsdk/cds.git] / cds-ui / application / pom.xml

diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index 52eb555..444e882 100644 (file)
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -24,24 +24,18 @@ limitations under the License.
 
     <parent>
         <groupId>org.onap.ccsdk.cds</groupId>
-        <artifactId>ui</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>cds-ui</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
-    <artifactId>application</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <artifactId>cds-ui-application</artifactId>
     <packaging>pom</packaging>
 
-    <name>CDS UI Application</name>
+    <name>UI Application</name>
 
     <properties>
         <image.name>onap/ccsdk-cds-ui</image.name>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <docker.verbose>true</docker.verbose>
     </properties>
 
     <build>
@@ -73,7 +67,7 @@ limitations under the License.
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.28.0</version>
+                        <version>0.34.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -89,19 +83,12 @@ limitations under the License.
                                     </build>
                                 </image>
                             </images>
+                            <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>deploy</phase>
+                                <id>build-push-images</id>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>