From a53007e8246c8d44b0c9af4bd3757313c48dd230 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Wed, 5 Jan 2022 16:17:09 -0600 Subject: SONAR-15966 Use Spring instead of Pico as dependency injection framework in the scanner-engine Co-authored-by: Zipeng WU --- .../src/main/java/org/sonar/scanner/scm/ScmConfiguration.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmConfiguration.java') diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmConfiguration.java index 05be6c2595a..25d91d49d31 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmConfiguration.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmConfiguration.java @@ -24,11 +24,11 @@ import java.util.Map; import java.util.stream.Collectors; import javax.annotation.CheckForNull; import org.apache.commons.lang.StringUtils; -import org.picocontainer.Startable; import org.sonar.api.CoreProperties; import org.sonar.api.Properties; import org.sonar.api.Property; import org.sonar.api.PropertyType; +import org.sonar.api.Startable; import org.sonar.api.batch.scm.ScmProvider; import org.sonar.api.config.Configuration; import org.sonar.api.notifications.AnalysisWarnings; @@ -67,7 +67,8 @@ public class ScmConfiguration implements Startable { private ScmProvider provider; - public ScmConfiguration(InputModuleHierarchy moduleHierarchy, Configuration settings, AnalysisWarnings analysisWarnings, ScmProvider... providers) { + public ScmConfiguration(InputModuleHierarchy moduleHierarchy, Configuration settings, AnalysisWarnings analysisWarnings, + ScmProvider... providers) { this.moduleHierarchy = moduleHierarchy; this.settings = settings; this.analysisWarnings = analysisWarnings; @@ -76,10 +77,6 @@ public class ScmConfiguration implements Startable { } } - public ScmConfiguration(InputModuleHierarchy moduleHierarchy, Configuration settings, AnalysisWarnings analysisWarnings) { - this(moduleHierarchy, settings, analysisWarnings, new ScmProvider[0]); - } - @Override public void start() { if (isDisabled()) { -- cgit v1.2.3