From: Ittay Stern <ittay.stern@att.com>
Date: Tue, 2 Jul 2019 11:32:06 +0000 (+0300)
Subject: Revert "Build module vid-ext-services-simulator"
X-Git-Tag: 5.0.0~46
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=94601aece8c9f5b687c6da86be9c6e8c148cf7ba;p=vid.git

Revert "Build module vid-ext-services-simulator"

Issue-ID: VID-507

This reverts commit 6946c31e, as it does not "deploy" successfully in
vid-master-merge-java.

Change-Id: I3863829a43d4232b6533cca75a7dd33a41e75c5f
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---

diff --git a/pom.xml b/pom.xml
index ef7815b37..b91431abc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
                 <module>vid-app-common</module>
                 <module>vid-webpack-master</module>
                 <module>epsdk-app-onap</module>
-                <module>vid-ext-services-simulator</module>
             </modules>
 
             <repositories>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index dd962db46..d7a2436a6 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -28,10 +28,6 @@
 
         <!-- "none" will skip cobertura by default; enable the profile "cobertura" to enable it -->
         <coberturaBuildPhase>none</coberturaBuildPhase>
-
-        <!-- will skip docker-maven-plugin by default; enable the profile "docker" to enable it -->
-        <dockerBuildPhase>none</dockerBuildPhase>
-        <dockerPushPhase>none</dockerPushPhase>
     </properties>
 
     <profiles>
@@ -88,14 +84,6 @@
             </properties>
         </profile>
 
-        <profile>
-            <id>docker</id>
-            <properties>
-                <dockerBuildPhase>package</dockerBuildPhase>
-                <dockerPushPhase>deploy</dockerPushPhase>
-            </properties>
-        </profile>
-
         <profile>
             <id>docker-proxy</id>
             <!-- activate profile if environment variable `http_proxy` is set -->
@@ -207,7 +195,7 @@
                 <executions>
                     <execution>
                         <id>generate-image</id>
-                        <phase>${dockerBuildPhase}</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>build</goal>
                         </goals>
@@ -215,7 +203,7 @@
 
                     <execution>
                         <id>push-image</id>
-                        <phase>${dockerPushPhase}</phase>
+                        <phase>deploy</phase>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>