From 6f900cc45d7dd7f97430812b86b5c1d1693c8ae3 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Wed, 29 Aug 2018 17:01:32 +0300
Subject: merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 vid-webpack-master/pom.xml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'vid-webpack-master/pom.xml')

diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index b4445dd04..3fa600f50 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -9,13 +9,16 @@
       inherit from a parent maven module. -->
   <groupId>org.onap.vid</groupId>
   <artifactId>vid-webpack-master</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.3.0</version>
   <packaging>war</packaging>
   <name>VID UI</name>
   <description>VID UI</description>
 
   <properties>
     <encoding>UTF-8</encoding>
+    <!--<springframework.version>4.2.0.RELEASE</springframework.version>-->
+    <!--<hibernate.version>4.3.11.Final</hibernate.version>-->
+    <!--<jackson.version>2.6.3</jackson.version>-->
     <!-- Skip assembling the zip by default -->
     <skipassembly>true</skipassembly>
     <!-- Tests usually require some setup that maven cannot do, so skip. -->
@@ -102,7 +105,7 @@
       </build>
     </profile>
     <profile>
-      <id>webpack</id>
+      <id>webpack-npm</id>
       <build>
         <plugins>
           <plugin>
@@ -150,22 +153,12 @@
               </execution>
 
               <execution>
-                <id>npm run test</id>
+                <id>npm run</id>
                 <goals>
                   <goal>npm</goal>
                 </goals>
                 <configuration>
-                  <arguments>run test</arguments>
-                </configuration>
-              </execution>
-
-              <execution>
-                <id>npm run build</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <configuration>
-                  <arguments>run build</arguments>
+                  <arguments>run ${NPM_CMD}</arguments>
                 </configuration>
               </execution>
 
-- 
cgit 1.2.3-korg