From 6c1cf2b3f49c04efa5b31271cd5affb793525299 Mon Sep 17 00:00:00 2001 From: Janos Gyerik Date: Mon, 11 Sep 2017 10:50:28 +0200 Subject: SONAR-9670 Introduce sonar.branch.longLivedBranches.regex --- .../src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java') diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java index 25db68aad37..46742e63153 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java @@ -25,9 +25,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.picocontainer.injectors.ProviderAdapter; -import org.sonar.api.batch.AnalysisMode; import org.sonar.api.batch.bootstrap.ProjectDefinition; import org.sonar.api.batch.fs.internal.DefaultInputModule; +import org.sonar.scanner.bootstrap.GlobalAnalysisMode; import org.sonar.scanner.bootstrap.GlobalConfiguration; import org.sonar.scanner.report.AnalysisContextReportPublisher; import org.sonar.scanner.repository.ProjectRepositories; @@ -37,7 +37,7 @@ public class ModuleSettingsProvider extends ProviderAdapter { private ModuleSettings projectSettings; public ModuleSettings provide(GlobalConfiguration globalSettings, DefaultInputModule module, ProjectRepositories projectRepos, - AnalysisMode analysisMode, AnalysisContextReportPublisher contextReportPublisher) { + GlobalAnalysisMode analysisMode, AnalysisContextReportPublisher contextReportPublisher) { if (projectSettings == null) { Map settings = new LinkedHashMap<>(); -- cgit v1.2.3