Release VID 6.0.3 (Frankfurt)

[vid.git] / vid-webpack-master / pom.xml

diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index 62d883d..3f6f946 100644 (file)
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -9,17 +9,15 @@
       inherit from a parent maven module. -->
   <groupId>org.onap.vid</groupId>
   <artifactId>vid-webpack-master</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>6.0.4-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>VID UI</name>
   <description>VID UI</description>
 
   <properties>
     <encoding>UTF-8</encoding>
-    <!--<epsdk.version>1.3.0</epsdk.version>-->
-    <!--<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. -->
@@ -30,6 +28,7 @@
     <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
     <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
     <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+    <NPM_CMD>ci</NPM_CMD>
   </properties>
 
 
@@ -57,23 +56,29 @@
   </repositories>
 
   <distributionManagement>
-                               <repository>
-                                       <id>ecomp-releases</id>
-                                       <name>VID Release Repository</name>
-                                       <url>${nexusproxy}/${releaseNexusPath}</url>
-                               </repository>
-                               <snapshotRepository>
-                                       <id>ecomp-snapshots</id>
-                                       <name>VID Snapshot Repository</name>
-                                       <url>${nexusproxy}/${snapshotNexusPath}</url>
-                               </snapshotRepository>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>VID Release Repository</name>
+      <url>${nexusproxy}/${releaseNexusPath}</url>
+    </repository>
+    <snapshotRepository>
+      <id>ecomp-snapshots</id>
+      <name>VID Snapshot Repository</name>
+      <url>${nexusproxy}/${snapshotNexusPath}</url>
+    </snapshotRepository>
 
   </distributionManagement>
 
   <profiles>
+
     <profile>
       <id>if-not-webpack</id>
-      <activation><activeByDefault>true</activeByDefault></activation>
+      <activation>
+        <property>
+          <name>skipModernUi</name>
+          <value>true</value>
+        </property>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -86,9 +91,10 @@
                 <phase>validate</phase>
                 <configuration>
                   <target>
-                    <mkdir dir="${project.basedir}/dist/" />
+                    <mkdir dir="${project.basedir}/dist/"/>
                     <echo file="${project.basedir}/dist/NO-WEBPACK.txt" append="false">
-                      Note: 'webpack' profile was not selected while mvn build. This 'dist' folder was created to make the war creation through.
+                      Note: 'webpack' profile was not selected while mvn build. This 'dist' folder was created to make
+                      the war creation through.
                     </echo>
                   </target>
                 </configuration>
@@ -102,8 +108,16 @@
         </plugins>
       </build>
     </profile>
+
     <profile>
-      <id>webpack</id>
+      <id>webpack-npm</id>
+      <activation>
+        <property>
+          <name>skipModernUi</name>
+          <value>!true</value>
+        </property>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -121,18 +135,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>
+                  <nodeVersion>v10.15.3</nodeVersion>
+                  <npmVersion>6.9.0</npmVersion>
                 </configuration>
               </execution>
 
@@ -151,25 +155,14 @@
               </execution>
 
               <execution>
-                <id>npm run test</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <configuration>
-                  <arguments>run test</arguments>
-                </configuration>
-              </execution>
-
-              <execution>
-                <id>npm run build</id>
+                <id>npm run</id>
                 <goals>
                   <goal>npm</goal>
                 </goals>
                 <configuration>
-                  <arguments>run build</arguments>
+                  <arguments>run ${NPM_CMD}</arguments>
                 </configuration>
               </execution>
-
             </executions>
           </plugin>
         </plugins>
@@ -241,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>
@@ -253,13 +246,18 @@
           <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>
   </dependencies>
-
 </project>