Merge branch 'master' into 'master'

Upgrade the npm version of maven build

Closes product-iots#567

See merge request entgra/carbon-device-mgt!577
revert-70ac1926
Dharmakeerthi Lasantha 4 years ago
commit e9a2018972

@ -66,7 +66,6 @@
<phase>generate-resources</phase> <phase>generate-resources</phase>
<configuration> <configuration>
<nodeVersion>${node.version}</nodeVersion> <nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

@ -69,7 +69,6 @@
<phase>generate-resources</phase> <phase>generate-resources</phase>
<configuration> <configuration>
<nodeVersion>${node.version}</nodeVersion> <nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

@ -2249,8 +2249,7 @@
<googlecode.plist.version>1.21</googlecode.plist.version> <googlecode.plist.version>1.21</googlecode.plist.version>
<net.dongliu.version>2.6.5</net.dongliu.version> <net.dongliu.version>2.6.5</net.dongliu.version>
<frontend.mave.version>1.7.6</frontend.mave.version> <frontend.mave.version>1.7.6</frontend.mave.version>
<node.version>v10.15.3</node.version> <node.version>v12.18.1</node.version>
<npm.version>6.9.0</npm.version>
<maven.checkstyle.vesion>3.1.0</maven.checkstyle.vesion> <maven.checkstyle.vesion>3.1.0</maven.checkstyle.vesion>

Loading…
Cancel
Save