aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-ui
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2019-11-26 17:20:27 +0000
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-12-01 08:14:44 +0000
commitf1f5a3581dca423dc9a687153eb0032f8311d6bd (patch)
tree6da9c02c7cac604fa6a9110f28e32a0ffd34393d /openecomp-ui
parent1367b73c1d1d761939f5893c711f87716a7baad0 (diff)
Upgrade Node & npm version
Change-Id: Ib41da68543824be671e162eb6c0ba78ded1949cb Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2685
Diffstat (limited to 'openecomp-ui')
-rw-r--r--openecomp-ui/pom.xml391
1 files changed, 195 insertions, 196 deletions
diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml
index 1f20ebbf11..4848e71705 100644
--- a/openecomp-ui/pom.xml
+++ b/openecomp-ui/pom.xml
@@ -1,211 +1,210 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>onboarding-fe</artifactId>
- <name>onboarding-ui-war</name>
- <packaging>war</packaging>
+ <artifactId>onboarding-fe</artifactId>
+ <name>onboarding-ui-war</name>
+ <packaging>war</packaging>
- <parent>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>sdc-onboarding</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <relativePath>../onboarding</relativePath>
- </parent>
+ <parent>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>sdc-onboarding</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <relativePath>../onboarding</relativePath>
+ </parent>
- <properties>
- <maven.war.plugin.version>3.0.0</maven.war.plugin.version>
- <app.context.path>onboarding</app.context.path>
- <jest.command />
- </properties>
+ <properties>
+ <maven.war.plugin.version>3.0.0</maven.war.plugin.version>
+ <app.context.path>onboarding</app.context.path>
+ <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>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6.1</version>
- <executions>
- <execution>
- <id>clean.dist.folder</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/dist</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/coverage</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/../dox-sequence-diagram-ui/dist
- </directory>
- </fileset>
- </filesets>
- </configuration>
- </execution>
- <execution>
- <id>clean.nodemodules.folder</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <skip>${skipUICleanup}</skip>
- <filesets>
- <fileset>
- <directory>${basedir}/node_modules</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/../dox-sequence-diagram-ui/node_modules
- </directory>
- </fileset>
- </filesets>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <!-- ============================================= -->
+ <!-- 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>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6.1</version>
+ <executions>
+ <execution>
+ <id>clean.dist.folder</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/dist</directory>
+ </fileset>
+ <fileset>
+ <directory>${basedir}/coverage</directory>
+ </fileset>
+ <fileset>
+ <directory>${basedir}/../dox-sequence-diagram-ui/dist
+ </directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean.nodemodules.folder</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <skip>${skipUICleanup}</skip>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/node_modules</directory>
+ </fileset>
+ <fileset>
+ <directory>${basedir}/../dox-sequence-diagram-ui/node_modules
+ </directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <!-- ============================================= -->
- <!-- Build the UI module node code -->
- <!-- ============================================= -->
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.6</version>
+ <!-- ============================================= -->
+ <!-- Build the UI module node code -->
+ <!-- ============================================= -->
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
- <configuration>
- <installDirectory>${project.parent.parent.basedir}</installDirectory>
- </configuration>
+ <configuration>
+ <installDirectory>${project.parent.parent.basedir}</installDirectory>
+ </configuration>
- <executions>
+ <executions>
- <execution>
- <id>install node and yarn</id>
- <goals>
- <goal>install-node-and-yarn</goal>
- </goals>
- <configuration>
- <nodeVersion>v9.4.0</nodeVersion>
- <yarnVersion>v1.7.0</yarnVersion>
- </configuration>
- </execution>
+ <execution>
+ <id>install node and yarn</id>
+ <goals>
+ <goal>install-node-and-yarn</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>v10.17.0</nodeVersion>
+ <yarnVersion>v1.19.1</yarnVersion>
+ </configuration>
+ </execution>
- <execution>
- <id>yarn install in dox-sequence-diagram-ui</id>
- <goals>
- <goal>yarn</goal>
- </goals>
- <configuration>
- <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
- </workingDirectory>
- <arguments>install</arguments>
- </configuration>
- </execution>
- <execution>
- <id>yarn build in dox-sequence-diagram-ui</id>
- <goals>
- <goal>yarn</goal>
- </goals>
- <configuration>
- <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
- </workingDirectory>
- <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
- <arguments>build</arguments>
- </configuration>
- </execution>
+ <execution>
+ <id>yarn install in dox-sequence-diagram-ui</id>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
+ </workingDirectory>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>yarn build in dox-sequence-diagram-ui</id>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
+ </workingDirectory>
+ <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+ <arguments>build</arguments>
+ </configuration>
+ </execution>
- <execution>
- <id>yarn install</id>
- <goals>
- <goal>yarn</goal>
- </goals>
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
+ <execution>
+ <id>yarn install</id>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
- <execution>
- <id>yarn build</id>
- <goals>
- <goal>yarn</goal>
- </goals>
- <configuration>
- <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
- <arguments>build --version=${project.version} --env.version=${project.version} --env.language=en</arguments>
- </configuration>
- </execution>
- <execution>
- <id>ui test</id>
- <goals>
- <goal>yarn</goal>
- </goals>
- <configuration>
- <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
- <arguments>test-build ${jest.command}</arguments>
- <skip>${skipTests}</skip>
- </configuration>
- <!-- for some reason does not fail on test phase -->
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
+ <execution>
+ <id>yarn build</id>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+ <arguments>build --version=${project.version} --env.version=${project.version} --env.language=en</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>ui test</id>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+ <arguments>test-build ${jest.command}</arguments>
+ <skip>${skipTests}</skip>
+ </configuration>
+ <!-- for some reason does not fail on test phase -->
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>${maven.war.plugin.version}</version>
- <configuration>
- <webResources>
- <resource>
- <directory>${basedir}/dist</directory>
- <includes>
- <include>*.html</include>
- <include>*.js</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src</directory>
- <includes>
- <include>**/*.json</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/external-resources/healthcheck/</directory>
- <targetPath>v1.0</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>healthcheck</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/webapp-onboarding</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven.war.plugin.version}</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${basedir}/dist</directory>
+ <includes>
+ <include>*.html</include>
+ <include>*.js</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src</directory>
+ <includes>
+ <include>**/*.json</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/external-resources/healthcheck/</directory>
+ <targetPath>v1.0</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>healthcheck</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/webapp-onboarding</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>