diff options
| author | Janos Gyerik <janos.gyerik@sonarsource.com> | 2017-09-11 10:50:28 +0200 |
|---|---|---|
| committer | Janos Gyerik <janos.gyerik@sonarsource.com> | 2017-09-12 11:34:59 +0200 |
| commit | 6c1cf2b3f49c04efa5b31271cd5affb793525299 (patch) | |
| tree | 345417875c24b789a9335d039e8db3afaf559888 /sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java | |
| parent | b559ffd60b0666f7debf7ca97f3487d1d476424d (diff) | |
| download | sonarqube-6c1cf2b3f49c04efa5b31271cd5affb793525299.tar.gz sonarqube-6c1cf2b3f49c04efa5b31271cd5affb793525299.zip | |
SONAR-9670 Introduce sonar.branch.longLivedBranches.regex
Diffstat (limited to 'sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java')
| -rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettingsProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
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<String, String> settings = new LinkedHashMap<>(); |