From: Eric Hartmann <hartmann.eric@gmail.com>
Date: Tue, 26 Jun 2018 07:50:56 +0000 (+0200)
Subject: SONAR-10890 Move official distribution to sonar-application
X-Git-Tag: 7.5~302
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c6ebf9cf36b441053b5388098cd23e559e065936;p=sonarqube.git

SONAR-10890 Move official distribution to sonar-application
---

diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle
index 9709c52724e..b79fb4df84e 100644
--- 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 41cd8d85b18..210d7947aab 100644
--- 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