From c6ebf9cf36b441053b5388098cd23e559e065936 Mon Sep 17 00:00:00 2001 From: Eric Hartmann Date: Tue, 26 Jun 2018 09:50:56 +0200 Subject: [PATCH] SONAR-10890 Move official distribution to sonar-application --- server/sonar-web/build.gradle | 8 -------- sonar-application/build.gradle | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) 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 -- 2.39.5