SONAR-10890 Move official distribution to sonar-application

diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle
index 9709c52724e325837ed7482e22f7caf7297f56b0..b79fb4df84e41c922a4a1b6125abb4aa04b50a7f 100644 (file)
--- a/server/sonar-web/build.gradle
+++ b/server/sonar-web/build.gradle
@@ -11,14 +11,6 @@ sonarqube {
 
 apply plugin: 'com.moowork.node'
 
-configurations {
-  branding
-}
-
-dependencies {
-  branding 'com.sonarsource:sonarsource-branding:1.3.0.307@war'
-}
-
 def webappDir = "${buildDir}/webapp"
 
 task copyBranding(type: Copy) {

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 41cd8d85b18ce8565ca34863fc115e8ce51b7ef1..210d7947aabf2a6136aa6fbf95ba7231ec68d408 100644 (file)
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -111,6 +111,9 @@ task zip(type: Zip, dependsOn: [configurations.compile]) {
     // FIXME use configurations.web with correct artifacts
     from tasks.getByPath(':server:sonar-web:yarn_run').outputs
     from tasks.getByPath(':server:sonar-vsts:yarn_run').outputs
+    if (official) {
+      from project(':private:branding').file('.')
+    }
   }
   into("${archiveDir}/lib/jdbc/mssql/") {
     from configurations.jdbc_mssql