X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-ui%2Fpom.xml;h=8c90c826b1e3c4d7a9ed6f31bc05901470f22df3;hb=924ba9adf027dd4969896cd905a8a41ba4c30655;hp=311403eadecc447bd1e5b37fe8173a0b4142f3c0;hpb=aa2eece0e8559be66454b757cae4bbccb59ea828;p=sdc.git

diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml
index 311403eade..8c90c826b1 100644
--- a/openecomp-ui/pom.xml
+++ b/openecomp-ui/pom.xml
@@ -17,8 +17,26 @@
 
     <properties>
         <maven.war.plugin.version>3.0.0</maven.war.plugin.version>
+        <jest.command />
     </properties>
 
+    <!-- ============================================= -->
+    <!-- Profile for windows to run jest one by the other due to current defect in node-graceful-js creating race condition -->
+    <!-- https://github.com/isaacs/node-graceful-fs/pull/119 -->
+    <!-- ============================================= -->
+    <profiles>
+        <profile>
+            <id>jest-windows-profile</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <properties>
+                <jest.command>--runInBand</jest.command>
+            </properties>
+        </profile>
+    </profiles>
     <build>
         <plugins>
             <plugin>
@@ -36,9 +54,9 @@
                                 <fileset>
                                     <directory>${basedir}/dist</directory>
                                 </fileset>
-                                <!--<fileset>-->
-                                    <!--<directory>${basedir}/node_modules</directory>-->
-                                <!--</fileset>-->
+                                <fileset>
+                                    <directory>${basedir}/node_modules</directory>
+                                </fileset>
                                 <fileset>
                                     <directory>${basedir}/coverage</directory>
                                 </fileset>
@@ -46,10 +64,10 @@
                                     <directory>${basedir}/../dox-sequence-diagram-ui/dist
                                     </directory>
                                 </fileset>
-                                <!--<fileset>-->
-                                    <!--<directory>${basedir}/../dox-sequence-diagram-ui/node_modules-->
-                                    <!--</directory>-->
-                                <!--</fileset>-->
+                                <fileset>
+                                    <directory>${basedir}/../dox-sequence-diagram-ui/node_modules
+                                    </directory>
+                                </fileset>
                             </filesets>
                         </configuration>
                     </execution>
@@ -62,7 +80,7 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.4</version>
+                <version>1.6</version>
 
                 <configuration>
                     <installDirectory>${project.parent.parent.basedir}</installDirectory>
@@ -71,30 +89,20 @@
                 <executions>
 
                     <execution>
-                        <id>install node and npm</id>
-                        <goals>
-                            <goal>install-node-and-npm</goal>
-                        </goals>
-                        <configuration>
-                            <nodeVersion>v6.9.5</nodeVersion>
-                            <npmVersion>3.10.10</npmVersion>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>npm set progress off</id>
+                        <id>install node and yarn</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>set progress=false</arguments>
+                            <nodeVersion>v9.4.0</nodeVersion>
+                            <yarnVersion>v1.3.2</yarnVersion>
                         </configuration>
                     </execution>
 
                     <execution>
-                        <id>npm install in dox-sequence-diagram-ui</id>
+                        <id>yarn install in dox-sequence-diagram-ui</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>yarn</goal>
                         </goals>
                         <configuration>
                             <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
@@ -103,21 +111,22 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>npm build in dox-sequence-diagram-ui</id>
+                        <id>yarn build in dox-sequence-diagram-ui</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>yarn</goal>
                         </goals>
                         <configuration>
                             <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
                             </workingDirectory>
+                             <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
                             <arguments>run build</arguments>
                         </configuration>
                     </execution>
 
                     <execution>
-                        <id>npm install</id>
+                        <id>yarn install</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>yarn</goal>
                         </goals>
                         <configuration>
                             <arguments>install</arguments>
@@ -125,21 +134,23 @@
                     </execution>
 
                     <execution>
-                        <id>npm run build</id>
+                        <id>yarn run build</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>run build -- --version=${project.version}</arguments>
+                            <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+                            <arguments>run build --version=${project.version}</arguments>
                         </configuration>
                     </execution>
                     <execution>
                         <id>ui test</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>run test-build</arguments>
+                            <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+                            <arguments>run test-build ${jest.command}</arguments>
                         </configuration>
                         <!-- for some reason does not fail on test phase -->
                         <phase>install</phase>