From ac02d11e7bd8b6fe00cecf5377844905a4df3eb1 Mon Sep 17 00:00:00 2001
From: wsliwka <wojciech.sliwka@nokia.com>
Date: Tue, 3 Sep 2019 11:02:42 +0200
Subject: Lets build modern ui by default

to disable modern ui build just use maven with -DskipModernUi=true

Added configuration for maven-cleanup-plugin to remove 'dist' directory

Issue-ID: VID-576
Signed-off-by: wsliwka <wojciech.sliwka@nokia.com>
Change-Id: I668820bbd28302b8cdaf13300b0f26cfcb3df398
Signed-off-by: wsliwka <wojciech.sliwka@nokia.com>
---
 vid-webpack-master/pom.xml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index d1398cc35..8d4ab156e 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -29,6 +29,7 @@
     <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
     <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
     <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+    <NPM_CMD>build</NPM_CMD>
   </properties>
 
 
@@ -73,7 +74,10 @@
     <profile>
       <id>if-not-webpack</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>skipModernUi</name>
+          <value>true</value>
+        </property>
       </activation>
       <build>
         <plugins>
@@ -106,6 +110,13 @@
     </profile>
     <profile>
       <id>webpack-npm</id>
+      <activation>
+        <property>
+          <name>skipModernUi</name>
+          <value>!true</value>
+        </property>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -161,7 +172,6 @@
                   <arguments>run ${NPM_CMD}</arguments>
                 </configuration>
               </execution>
-
             </executions>
           </plugin>
         </plugins>
@@ -245,7 +255,16 @@
           <webXml>src/WEB-INF/web.xml</webXml>
         </configuration>
       </plugin>
-
+    <plugin>
+      <artifactId>maven-clean-plugin</artifactId>
+      <configuration>
+        <filesets>
+          <fileset>
+            <directory>dist</directory>
+          </fileset>
+        </filesets>
+      </configuration>
+    </plugin>
     </plugins>
   </build>
   <dependencies>
-- 
cgit 1.2.3-korg