From 560aa9070df514c432f2189618d04daaade858dd Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 21 Aug 2018 17:12:37 +0200
Subject: [PATCH] Upgrade versions of nodejs and yarn

and use a consistent version across modules
---
 build.gradle                   | 10 ++++++++++
 server/sonar-docs/build.gradle |  8 --------
 server/sonar-vsts/build.gradle |  8 --------
 server/sonar-web/build.gradle  |  8 --------
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4ae4c5c0cb8..9ee3e02e0ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -286,6 +286,16 @@ subprojects {
     ide.dependsOn(['generateProto', 'generateTestProto'])
   }
 
+  if (file('package.json').exists()) {
+    apply plugin: 'com.moowork.node'
+
+    node {
+      version = '8.11.4'
+      yarnVersion = '1.9.4'
+      download = true
+    }
+  }
+
   if (official) {
     jar {
       // do not break incremental build on non official versions
diff --git a/server/sonar-docs/build.gradle b/server/sonar-docs/build.gradle
index fde6adc800f..2eda44a721d 100644
--- a/server/sonar-docs/build.gradle
+++ b/server/sonar-docs/build.gradle
@@ -8,14 +8,6 @@ sonarqube {
 
 group = 'com.sonarsource.sonarqube'
 
-apply plugin: 'com.moowork.node'
-
-node {
-  version = '8.10.0'
-  yarnVersion = '1.5.1'
-  download = true
-}
-
 yarn_run {
   inputs.dir('src').withPathSensitivity(PathSensitivity.RELATIVE)
   inputs.files('gatsby-config.js', 'gatsby-node.js', 'package.json', 'yarn.lock')
diff --git a/server/sonar-vsts/build.gradle b/server/sonar-vsts/build.gradle
index cafcaaaab9d..0fcc093a369 100644
--- a/server/sonar-vsts/build.gradle
+++ b/server/sonar-vsts/build.gradle
@@ -9,14 +9,6 @@ sonarqube {
   }
 }
 
-apply plugin: 'com.moowork.node'
-
-node {
-  version = '8.10.0'
-  yarnVersion = '1.7.0'
-  download = true
-}
-
 yarn_run {
   ['config', 'public', 'scripts', 'src'].each {
     inputs.dir(it).withPathSensitivity(PathSensitivity.RELATIVE)
diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle
index b6359bf0c2a..b8dd4e05fff 100644
--- a/server/sonar-web/build.gradle
+++ b/server/sonar-web/build.gradle
@@ -9,8 +9,6 @@ sonarqube {
   }
 }
 
-apply plugin: 'com.moowork.node'
-
 configurations {
   branding
 }
@@ -49,12 +47,6 @@ task copyBranding() {
   dependsOn copyBrandingFile
 }
 
-node {
-  version = '8.10.0'
-  yarnVersion = '1.7.0'
-  download = true
-}
-
 yarn_run {
   if (official) { dependsOn copyBranding }
   ['config', 'public', 'scripts', 'src', '../sonar-docs/src'].each {
-- 
2.39.5