SONAR-10860 Make sonar-web cacheable with sonar-docs

diff --git a/build.gradle b/build.gradle
index 2a55eceb0cba2df625760b5abb4b3123360ed71e..45109576a38459b3aa2594ad831a1cc76ba4ea93 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -421,7 +421,7 @@ artifactory {
       'com.sonarsource.sonarqube:sonarqube-developer:yguard,' +
       'com.sonarsource.sonarqube:sonarqube-datacenter:yguard,' +
       'com.sonarsource.sonarqube:sonarqube-enterprise:yguard,' +
-      'com.sonarsource.sonarqube:docs:zip')
+      'com.sonarsource.sonarqube:sonar-docs:zip')
   // The name of this variable is important because it's used by the delivery process when extracting version from Artifactory build info.
   clientConfig.info.addEnvironmentProperty('PROJECT_VERSION', "${version}")
 }

diff --git a/server/sonar-docs/build.gradle b/server/sonar-docs/build.gradle
index 0af1f4e30942820d9c6ba9835daa88e36b914c4e..d0a80b4184ed14257e3c49a5010917d21bfefece 100644 (file)
--- a/server/sonar-docs/build.gradle
+++ b/server/sonar-docs/build.gradle
@@ -6,6 +6,8 @@ sonarqube {
   skipProject = true
 }
 
+group = 'com.sonarsource'
+
 apply plugin: 'com.moowork.node'
 
 node {

diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle
index 7099b734ce068064cae400a06e7c7df63c7e6944..42b555a80310a4a6da8a2ecf894ceed24b92ffe6 100644 (file)
--- a/server/sonar-web/build.gradle
+++ b/server/sonar-web/build.gradle
@@ -57,7 +57,7 @@ node {
 
 yarn_run {
   if (official) { dependsOn copyBranding }
-  ['config', 'public', 'scripts', 'src'].each {
+  ['config', 'public', 'scripts', 'src', '../sonar-docs/src'].each {
     inputs.dir(it).withPathSensitivity(PathSensitivity.RELATIVE)
   }
   ['.babelrc', 'build.gradle', 'package.json', 'tsconfig.json', 'yarn.lock'].each {