From eaf55a773a370104c9b8eb30b9a38fbc00be87f9 Mon Sep 17 00:00:00 2001
From: vagrant <vv770d@att.com>
Date: Wed, 26 Sep 2018 04:04:44 +0000
Subject: [PATCH] switch tca to docker-maven-plugin

Change-Id: I2b0763547c35ae4d89d64cfe06e9bfde4227aa98
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-772
---
 dcae-analytics/dcae-analytics-tca-web/pom.xml | 11 +++++++++--
 dcae-analytics/pom.xml                        |  9 ++++++---
 pom.xml                                       |  8 ++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 002edcd..2e1195d 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -138,8 +138,14 @@
             <!-- DOCKER PLUGIN -->
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <executions>
+                <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                        <skipDocker>false</skipDocker>
+                        <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository>
+                        <tag>${project.version}</tag>
+                </configuration>
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>
+                   <executions>
                     <execution>
                         <id>build-image</id>
                         <phase>package</phase>
@@ -155,6 +161,7 @@
                         </goals>
                     </execution>
                 </executions>
+-->
             </plugin>
         </plugins>
     </build>
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index fc48e7e..8bdcf1d 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -86,7 +86,8 @@
         <lombok.plugin.version>1.16.18.1</lombok.plugin.version>
         <gitcommitid.plugin.version>2.2.3</gitcommitid.plugin.version>
         <maven.build.helper.plugin.version>3.0.0</maven.build.helper.plugin.version>
-        <dockerfile-maven-version>1.4.3</dockerfile-maven-version>
+        <!--<dockerfile-maven-version>1.4.3</dockerfile-maven-version>-->
+	<docker-maven-version>1.0.0</docker-maven-version>
 
         <!--PLUGIN SETTINGS -->
         <compiler.source.version>1.8</compiler.source.version>
@@ -629,15 +630,17 @@
                 </plugin>
 
                 <!-- DOCKER PLUGIN -->
+		<!--
                 <plugin>
                     <groupId>com.spotify</groupId>
-                    <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>${dockerfile-maven-version}</version>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>${docker-maven-version}</version>
                     <configuration>
                         <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository>
                         <tag>${project.version}</tag>
                     </configuration>
                 </plugin>
+		-->
 
             </plugins>
 
diff --git a/pom.xml b/pom.xml
index d894d3f..47c9ace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,14 @@
                     </execution>
                 </executions>
             </plugin>
+                <plugin>
+                    <groupId>com.spotify</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>1.1.0</version>
+                    <configuration>
+                        <skipDocker>true</skipDocker>
+                    </configuration>
+                </plugin>
         </plugins>
     </build>
 
-- 
2.16.6