2 files changed, 21 insertions, 9 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliService.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliService.java
index 013ac2df109..530798c4395 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliService.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliService.java
@@ -30,18 +30,21 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
+import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputModule;
 import org.sonar.api.platform.Server;
 import org.sonar.api.utils.System2;
 import org.sonar.core.util.ProcessWrapperFactory;
 import org.sonar.scanner.config.DefaultConfiguration;
 import org.sonar.scanner.repository.TelemetryCache;
+import org.sonar.scanner.scan.filesystem.ProjectExclusionFilters;
 import org.sonar.scanner.scm.ScmConfiguration;
 import org.sonar.scm.git.JGitUtils;
 
@@ -53,20 +56,24 @@ import org.sonar.scm.git.JGitUtils;
  */
 public class CliService {
   private static final Logger LOG = LoggerFactory.getLogger(CliService.class);
-  public static final String EXCLUDED_MANIFESTS_PROP_KEY = "sonar.sca.excludedManifests";
+  public static final String SCA_EXCLUSIONS_KEY = "sonar.sca.exclusions";
+  public static final String LEGACY_SCA_EXCLUSIONS_KEY = "sonar.sca.excludedManifests";
 
   private final ProcessWrapperFactory processWrapperFactory;
   private final TelemetryCache telemetryCache;
   private final System2 system2;
   private final Server server;
   private final ScmConfiguration scmConfiguration;
+  private final ProjectExclusionFilters projectExclusionFilters;
 
-  public CliService(ProcessWrapperFactory processWrapperFactory, TelemetryCache telemetryCache, System2 system2, Server server, ScmConfiguration scmConfiguration) {
+  public CliService(ProcessWrapperFactory processWrapperFactory, TelemetryCache telemetryCache, System2 system2, Server server, ScmConfiguration scmConfiguration,
+    ProjectExclusionFilters projectExclusionFilters) {
     this.processWrapperFactory = processWrapperFactory;
     this.telemetryCache = telemetryCache;
     this.system2 = system2;
     this.server = server;
     this.scmConfiguration = scmConfiguration;
+    this.projectExclusionFilters = projectExclusionFilters;
   }
 
   public File generateManifestsZip(DefaultInputModule module, File cliExecutable, DefaultConfiguration configuration) throws IOException, IllegalStateException {
@@ -121,7 +128,7 @@ public class CliService {
   }
 
   private @Nullable String getExcludeFlag(DefaultInputModule module, DefaultConfiguration configuration) throws IOException {
-    List<String> configExcludedPaths = getConfigExcludedPaths(configuration);
+    List<String> configExcludedPaths = getConfigExcludedPaths(configuration, projectExclusionFilters);
     List<String> scmIgnoredPaths = getScmIgnoredPaths(module);
 
     ArrayList<String> mergedExclusionPaths = new ArrayList<>();
@@ -141,12 +148,15 @@ public class CliService {
     return toCsvString(mergedExclusionPaths);
   }
 
-  private static List<String> getConfigExcludedPaths(DefaultConfiguration configuration) {
-    String[] excludedPaths = configuration.getStringArray(EXCLUDED_MANIFESTS_PROP_KEY);
-    if (excludedPaths == null) {
-      return List.of();
-    }
-    return Arrays.stream(excludedPaths).toList();
+  private static List<String> getConfigExcludedPaths(DefaultConfiguration configuration, ProjectExclusionFilters projectExclusionFilters) {
+    String[] sonarExclusions = projectExclusionFilters.getExclusionsConfig(InputFile.Type.MAIN);
+    String[] scaExclusions = configuration.getStringArray(SCA_EXCLUSIONS_KEY);
+    String[] scaExclusionsLegacy = configuration.getStringArray(LEGACY_SCA_EXCLUSIONS_KEY);
+
+    return Stream.of(sonarExclusions, scaExclusions, scaExclusionsLegacy)
+      .flatMap(Arrays::stream)
+      .distinct()
+      .toList();
   }
 
   private List<String> getScmIgnoredPaths(DefaultInputModule module) {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/ScaProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/ScaProperties.java
index e5086149c03..a697aef3e20 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/ScaProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/ScaProperties.java
@@ -31,6 +31,8 @@ public class ScaProperties {
   private static final Pattern sonarScaPropertyRegex = Pattern.compile("^sonar\\.sca\\.([a-zA-Z]+)$");
   private static final String SONAR_SCA_PREFIX = "sonar.sca.";
   private static final Set<String> IGNORED_PROPERTIES = Set.of(
+    // sonar.sca.exclusions is a special case which we handle when building --exclude
+    "sonar.sca.exclusions",
     // excludedManifests is a special case which we handle when building --exclude
     "sonar.sca.excludedManifests",
     // keep recursive enabled to better match sonar-scanner behavior