summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmichai Hemli <amichai.hemli@intl.att.com>2020-04-07 05:23:54 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-07 05:23:54 +0000
commit49aca2f796200b2e4bdc16aababc7419932a7f6a (patch)
tree31ef2f2327f21bf1fd859a44803ede41bd590027
parent5a5af80b9f6475b44de3e95ebca8f7fb05d75272 (diff)
parente9d0f6aaef6c4f0ef721a5d3c83fce9a694925a0 (diff)
Merge "Update frontend-maven-plugin, node, npm"
-rwxr-xr-xvid-app-common/pom.xml6
-rw-r--r--vid-webpack-master/pom.xml17
2 files changed, 14 insertions, 9 deletions
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 7d8bff722..d50a099d5 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -59,9 +59,9 @@
<kotlin.version>1.3.60</kotlin.version>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
- <eirslett.version>1.6</eirslett.version>
- <node.version>v8.9.4</node.version>
- <npm.version>5.6.0</npm.version>
+ <eirslett.version>1.9.1</eirslett.version>
+ <node.version>v10.19.0</node.version>
+ <npm.version>6.14.4</npm.version>
<!-- override using -Drelease_version=foo -Dpatch_version=bar -->
<release_version>${env.release_version}</release_version>
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index d56a4465c..d556289bd 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -28,6 +28,11 @@
<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>
@@ -124,7 +129,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>
@@ -135,8 +140,8 @@
</goals>
<configuration>
<!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
- <nodeVersion>v10.15.3</nodeVersion>
- <npmVersion>6.9.0</npmVersion>
+ <npmVersion>${npm.version}</npmVersion>
+ <nodeVersion>${node.version}</nodeVersion>
</configuration>
</execution>
@@ -177,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>
@@ -188,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>