aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Hartmann <hartmann.eric@gmail.com>2018-06-28 16:12:32 +0200
committersonartech <sonartech@sonarsource.com>2018-06-29 09:10:19 +0200
commit9973bacbfa4a945e509bf1b574d7e5aae4ba155a (patch)
treebea7920cd9901a47319a42ca0a5436e579c78e8c
parent769673ede15e8ec4c5737475a9eb901b4524c1df (diff)
downloadsonarqube-9973bacbfa4a945e509bf1b574d7e5aae4ba155a.tar.gz
sonarqube-9973bacbfa4a945e509bf1b574d7e5aae4ba155a.zip
SONAR-10860 Make sonar-web cacheable with sonar-docs
-rw-r--r--build.gradle2
-rw-r--r--server/sonar-docs/build.gradle2
-rw-r--r--server/sonar-web/build.gradle2
3 files changed, 4 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index 2a55eceb0cb..45109576a38 100644
--- 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 0af1f4e3094..d0a80b4184e 100644
--- 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 7099b734ce0..42b555a8031 100644
--- 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 {