Commit 6875bc42 authored by Alexandre DESMONTILS's avatar Alexandre DESMONTILS
Browse files

Merge remote-tracking branch 'upstream/master'

parents 9a32bea9 e451f8f6
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<configuration> <configuration>
<workingDirectory>./</workingDirectory> <workingDirectory>./</workingDirectory>
<nodeVersion>v14.11.0</nodeVersion> <nodeVersion>v14.11.0</nodeVersion>
<npmVersion>6.14.8</npmVersion> <npmVersion>7.0.10</npmVersion>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
...@@ -29,12 +29,17 @@ ...@@ -29,12 +29,17 @@
<goals> <goals>
<goal>install-node-and-npm</goal> <goal>install-node-and-npm</goal>
</goals> </goals>
<phase>generate-resources</phase>
</execution> </execution>
<execution> <execution>
<id>npm install</id> <id>npm install</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration>
<arguments>install</arguments>
</configuration>
<phase>generate-resources</phase>
</execution> </execution>
<execution> <execution>
<id>npm run build</id> <id>npm run build</id>
...@@ -46,8 +51,8 @@ ...@@ -46,8 +51,8 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>code geneation</id> <id>code generation</id>
<phase>generate-sources</phase> <phase>compile</phase>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment