X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cds-ui%2Fapplication%2Fpom.xml;h=92fa809b012e7f84bc00cc49a33f4d82ce9b3ef7;hb=7778e386eff2b7f8a0bac9e2f1b75dda3827c769;hp=358de718e5cb197c6993beda8d71bfa8e0e349b7;hpb=71f561eb81dfa6c777cc296693cd8f69cb58b8b0;p=ccsdk%2Fcds.git

diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index 358de718e..92fa809b0 100644
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -23,31 +23,26 @@ limitations under the License.
 
     <parent>
         <groupId>org.onap.ccsdk.cds</groupId>
-        <artifactId>ui</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <artifactId>cds-ui</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
-    <artifactId>application</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <artifactId>cds-ui-application</artifactId>
     <packaging>pom</packaging>
 
-    <name>CDS UI Application</name>
+    <name>CDS 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>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -64,14 +59,14 @@ limitations under the License.
     </build>
 
     <profiles>
-        <profile>
+        <!--<profile>
             <id>docker</id>
             <build>
                 <plugins>
                     <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>
@@ -79,6 +74,7 @@ limitations under the License.
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
                                             <tag>${project.docker.latestfulltag.version}</tag>
@@ -87,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>
@@ -109,6 +98,6 @@ limitations under the License.
                     </plugin>
                 </plugins>
             </build>
-        </profile>
+        </profile>-->
     </profiles>
 </project>