From 1ea0fba721acca7bfbdbed82cdeaf779e39ca85f Mon Sep 17 00:00:00 2001
From: Julien Carsique <julien.carsique@sonarsource.com>
Date: Fri, 2 Sep 2022 17:55:10 +0200
Subject: BUILD-1745 execute only on CI and main branch or explicit call

fix: remove sonar-web from bom inputs.files, a dedicated yarn bom build is to be implemented if needed
---
 sonar-application/build.gradle | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sonar-application')

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 59f09a9d780..9f24ddbccd3 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -340,7 +340,7 @@ cyclonedxBom {
   outputs.file bomFile
 }
 tasks.cyclonedxBom {
-  inputs.files(configurations.runtimeClasspath, configurations.web, configurations.shutdowner, configurations.jdbc_mssql,
+  inputs.files(configurations.runtimeClasspath, configurations.shutdowner, configurations.jdbc_mssql,
           configurations.jdbc_postgresql, configurations.jdbc_h2, configurations.bundledPlugin_deps, configurations.cyclonedx)
 }
 def bomArtifact = artifacts.add('archives', bomFile.get().asFile) {
@@ -354,8 +354,10 @@ publishing {
     mavenJava(MavenPublication) {
       artifact zip
     }
-    mavenJava(MavenPublication) {
-      artifact bomArtifact
+    if (enableBom) {
+      mavenJava(MavenPublication) {
+        artifact bomArtifact
+      }
     }
   }
 }
-- 
cgit v1.2.3