Use node and npm version from pom.xml.

jhipster · May 15, 2021 · c728a7a · c728a7a
1 parent accac71
commit c728a7a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/generators/ci-cd/templates/.gitlab-ci.yml.ejs b/generators/ci-cd/templates/.gitlab-ci.yml.ejs
@@ -184,7 +184,7 @@ before_script:
     - export MAVEN_USER_HOME=`pwd`/.maven
     <%_ if (!skipClient) { _%>
         <%_ if (!insideDocker) { _%>
-    - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v<%= NODE_VERSION %> -DnpmVersion=<%= NPM_VERSION %> -Dmaven.repo.local=$MAVEN_USER_HOME
+    - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm
     - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:<%= clientPackageManager %> -Dmaven.repo.local=$MAVEN_USER_HOME
         <%_ } _%>
     <%_ } _%>

diff --git a/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs b/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs
@@ -44,7 +44,7 @@ node {
 
     <%_ if (!skipClient) { _%>
 <%= indent %>    stage('install tools') {
-<%= indent %>        sh "./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v<%= NODE_VERSION %> -DnpmVersion=<%= NPM_VERSION %>"
+<%= indent %>        sh "./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm"
 <%= indent %>    }
 
 <%= indent %>    stage('npm install') {

diff --git a/test/__snapshots__/ci-cd.spec.js.snap b/test/__snapshots__/ci-cd.spec.js.snap
@@ -1924,7 +1924,7 @@ stages:
 before_script:
   - export NG_CLI_ANALYTICS=\\"false\\"
   - export MAVEN_USER_HOME=\`pwd\`/.maven
-  - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v14.16.0 -DnpmVersion=7.12.1 -Dmaven.repo.local=$MAVEN_USER_HOME
+  - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm
   - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:npm -Dmaven.repo.local=$MAVEN_USER_HOME
 
 nohttp:
@@ -2040,7 +2040,7 @@ stages:
 before_script:
   - export NG_CLI_ANALYTICS=\\"false\\"
   - export MAVEN_USER_HOME=\`pwd\`/.maven
-  - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v14.16.0 -DnpmVersion=7.12.1 -Dmaven.repo.local=$MAVEN_USER_HOME
+  - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm
   - ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:npm -Dmaven.repo.local=$MAVEN_USER_HOME
 
 nohttp:
@@ -2717,7 +2717,7 @@ node {
         }
 
         stage('install tools') {
-            sh \\"./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v14.16.0 -DnpmVersion=7.12.1\\"
+            sh \\"./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm\\"
         }
 
         stage('npm install') {
@@ -3008,7 +3008,7 @@ node {
     }
 
     stage('install tools') {
-        sh \\"./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v14.16.0 -DnpmVersion=7.12.1\\"
+        sh \\"./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm\\"
     }
 
     stage('npm install') {
@@ -3208,7 +3208,7 @@ node {
     }
 
     stage('install tools') {
-        sh \\"./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v14.16.0 -DnpmVersion=7.12.1\\"
+        sh \\"./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm\\"
     }
 
     stage('npm install') {