X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vid-webpack-master%2Fpom.xml;h=6bf8a3632959bc5459e73dbd9ab9d41dc218bfd2;hb=HEAD;hp=c86d61308f9dd5134be1f3e1041a0b470b882027;hpb=f6784c3d4da1b0b70e2f153e4dad8400e6dc55e7;p=vid.git

diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index c86d61308..6bf8a3632 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -9,16 +9,15 @@
       inherit from a parent maven module. -->
   <groupId>org.onap.vid</groupId>
   <artifactId>vid-webpack-master</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>8.0.2-SNAPSHOT</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>-->
+    <!--<springframework.version>5.1.6.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. -->
@@ -29,6 +28,12 @@
     <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
     <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
     <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+
+    <eirslett.version>1.9.1</eirslett.version>
+    <node.version>v10.19.0</node.version>
+    <npm.version>6.14.4</npm.version>
+
+    <NPM_CMD>ci</NPM_CMD>
   </properties>
 
 
@@ -70,10 +75,14 @@
   </distributionManagement>
 
   <profiles>
+
     <profile>
       <id>if-not-webpack</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>skipModernUi</name>
+          <value>true</value>
+        </property>
       </activation>
       <build>
         <plugins>
@@ -104,15 +113,23 @@
         </plugins>
       </build>
     </profile>
+
     <profile>
       <id>webpack-npm</id>
+      <activation>
+        <property>
+          <name>skipModernUi</name>
+          <value>!true</value>
+        </property>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
             <!-- NB! Set <version> to the latest released version of frontend-maven-plugin, like in README.md -->
-            <version>1.6</version>
+            <version>${eirslett.version}</version>
 
             <executions>
 
@@ -123,18 +140,8 @@
                 </goals>
                 <configuration>
                   <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
-                  <nodeVersion>v8.9.4</nodeVersion>
-                  <npmVersion>5.6.0</npmVersion>
-                </configuration>
-              </execution>
-
-              <execution>
-                <id>npm set no-progress</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <configuration>
-                  <arguments>set progress=false</arguments>
+                  <npmVersion>${npm.version}</npmVersion>
+                  <nodeVersion>${node.version}</nodeVersion>
                 </configuration>
               </execution>
 
@@ -161,7 +168,6 @@
                   <arguments>run ${NPM_CMD}</arguments>
                 </configuration>
               </execution>
-
             </executions>
           </plugin>
         </plugins>
@@ -176,7 +182,7 @@
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
             <!-- NB! Set <version> to the latest released version of frontend-maven-plugin, like in README.md -->
-            <version>1.6</version>
+            <version>${eirslett.version}</version>
 
             <executions>
 
@@ -187,8 +193,8 @@
                 </goals>
                 <configuration>
                   <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
-                  <nodeVersion>v8.9.4</nodeVersion>
-                  <npmVersion>5.6.0</npmVersion>
+                  <npmVersion>${npm.version}</npmVersion>
+                  <nodeVersion>${node.version}</nodeVersion>
                 </configuration>
               </execution>
 
@@ -200,11 +206,6 @@
                 <!-- Optional configuration which provides for running any npm command -->
                 <configuration>
                   <arguments>install --verbose cypress @bahmutov/add-typescript-to-cypress</arguments>
-                  <environmentVariables>
-                    <NO_PROXY>.att.com</NO_PROXY>
-                    <http_proxy>http://one.proxy.att.com:8080</http_proxy>
-                    <https_proxy>http://one.proxy.att.com:8080</https_proxy>
-                  </environmentVariables>
                 </configuration>
               </execution>
 
@@ -233,7 +234,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.3</version>
         <configuration>
           <webResources>
             <resource>
@@ -245,7 +246,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>