Code Review
/
vid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update frontend-maven-plugin, node, npm"
[vid.git]
/
vid-webpack-master
/
pom.xml
diff --git
a/vid-webpack-master/pom.xml
b/vid-webpack-master/pom.xml
index
3f6f946
..
d556289
100644
(file)
--- a/
vid-webpack-master/pom.xml
+++ b/
vid-webpack-master/pom.xml
@@
-9,7
+9,7
@@
inherit from a parent maven module. -->
<groupId>org.onap.vid</groupId>
<artifactId>vid-webpack-master</artifactId>
inherit from a parent maven module. -->
<groupId>org.onap.vid</groupId>
<artifactId>vid-webpack-master</artifactId>
- <version>6.0.
4
-SNAPSHOT</version>
+ <version>6.0.
5
-SNAPSHOT</version>
<packaging>war</packaging>
<name>VID UI</name>
<description>VID UI</description>
<packaging>war</packaging>
<name>VID UI</name>
<description>VID UI</description>
@@
-28,6
+28,11
@@
<stagingNexusPath>content/repositories/staging/</stagingNexusPath>
<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
<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>
<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 -->
<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>
<executions>
@@
-135,8
+140,8
@@
</goals>
<configuration>
<!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
</goals>
<configuration>
<!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
- <n
odeVersion>v10.15.3</node
Version>
- <n
pmVersion>6.9.0</npm
Version>
+ <n
pmVersion>${npm.version}</npm
Version>
+ <n
odeVersion>${node.version}</node
Version>
</configuration>
</execution>
</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 -->
<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>
<executions>
@@
-188,8
+193,8
@@
</goals>
<configuration>
<!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
</goals>
<configuration>
<!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
- <n
odeVersion>v8.9.4</node
Version>
- <n
pmVersion>5.6.0</npm
Version>
+ <n
pmVersion>${npm.version}</npm
Version>
+ <n
odeVersion>${node.version}</node
Version>
</configuration>
</execution>
</configuration>
</execution>
@@
-201,11
+206,6
@@
<!-- Optional configuration which provides for running any npm command -->
<configuration>
<arguments>install --verbose cypress @bahmutov/add-typescript-to-cypress</arguments>
<!-- Optional configuration which provides for running any npm command -->
<configuration>
<arguments>install --verbose cypress @bahmutov/add-typescript-to-cypress</arguments>
- <environmentVariables>
- <NO_PROXY>.att.com</NO_PROXY>
- <http_proxy>http://one.proxy.att.com:8080</http_proxy>
- <https_proxy>http://one.proxy.att.com:8080</https_proxy>
- </environmentVariables>
</configuration>
</execution>
</configuration>
</execution>