1 files changed, 13 insertions, 24 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java
index 29f1389e20c..133f4387856 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java
@@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.internal.FileMetadata;
 import org.sonar.api.batch.rule.CheckFactory;
 import org.sonar.api.batch.sensor.issue.internal.DefaultNoSonarFilter;
-import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.scan.filesystem.PathResolver;
 import org.sonar.core.extension.CoreExtensionsInstaller;
 import org.sonar.core.metric.ScannerMetrics;
@@ -87,6 +86,8 @@ import org.sonar.scanner.repository.ProjectRepositoriesProvider;
 import org.sonar.scanner.repository.QualityProfilesProvider;
 import org.sonar.scanner.repository.ReferenceBranchSupplier;
 import org.sonar.scanner.repository.TelemetryCache;
+import org.sonar.scanner.repository.featureflags.DefaultFeatureFlagsLoader;
+import org.sonar.scanner.repository.featureflags.DefaultFeatureFlagsRepository;
 import org.sonar.scanner.repository.language.DefaultLanguagesLoader;
 import org.sonar.scanner.repository.language.DefaultLanguagesRepository;
 import org.sonar.scanner.repository.settings.DefaultProjectSettingsLoader;
@@ -98,7 +99,6 @@ import org.sonar.scanner.scan.InputModuleHierarchyProvider;
 import org.sonar.scanner.scan.InputProjectProvider;
 import org.sonar.scanner.scan.ModuleIndexer;
 import org.sonar.scanner.scan.MutableProjectReactorProvider;
-import org.sonar.scanner.scan.MutableProjectSettings;
 import org.sonar.scanner.scan.ProjectBuildersExecutor;
 import org.sonar.scanner.scan.ProjectConfigurationProvider;
 import org.sonar.scanner.scan.ProjectLock;
@@ -115,6 +115,7 @@ import org.sonar.scanner.scan.branch.BranchType;
 import org.sonar.scanner.scan.branch.ProjectBranchesProvider;
 import org.sonar.scanner.scan.filesystem.DefaultProjectFileSystem;
 import org.sonar.scanner.scan.filesystem.FilePreprocessor;
+import org.sonar.scanner.scan.filesystem.HiddenFilesProjectData;
 import org.sonar.scanner.scan.filesystem.InputComponentStore;
 import org.sonar.scanner.scan.filesystem.LanguageDetection;
 import org.sonar.scanner.scan.filesystem.MetadataGenerator;
@@ -152,25 +153,10 @@ public class SpringScannerContainer extends SpringComponentContainer {
 
   @Override
   protected void doBeforeStart() {
-    addSuffixesDeprecatedProperties();
     addScannerExtensions();
     addComponents();
   }
 
-  private void addSuffixesDeprecatedProperties() {
-    add(
-      /*
-       * This is needed to support properly the deprecated sonar.rpg.suffixes property when the download optimization feature is enabled.
-       * The value of the property is needed at the preprocessing stage, but being defined by an optional analyzer means that at preprocessing
-       * it won't be properly available. This will be removed in SQ 11.0 together with the drop of the property from the rpg analyzer.
-       * See SONAR-21514
-       */
-      PropertyDefinition.builder("sonar.rpg.file.suffixes")
-        .deprecatedKey("sonar.rpg.suffixes")
-        .multiValues(true)
-        .build());
-  }
-
   private void addScannerExtensions() {
     getParentComponentByType(CoreExtensionsInstaller.class)
       .install(this, noExtensionFilter(), extension -> getScannerProjectExtensionsFilter().accept(extension));
@@ -214,6 +200,7 @@ public class SpringScannerContainer extends SpringComponentContainer {
       FilePreprocessor.class,
       ProjectFilePreprocessor.class,
       ProjectExclusionFilters.class,
+      HiddenFilesProjectData.class,
 
       // rules
       new ActiveRulesProvider(),
@@ -240,7 +227,6 @@ public class SpringScannerContainer extends SpringComponentContainer {
       ContextPropertiesCache.class,
       TelemetryCache.class,
 
-      MutableProjectSettings.class,
       SonarGlobalPropertiesFilter.class,
       ProjectConfigurationProvider.class,
 
@@ -309,17 +295,20 @@ public class SpringScannerContainer extends SpringComponentContainer {
       GitlabCi.class,
       Jenkins.class,
       SemaphoreCi.class,
-      TravisCi.class);
-
-    add(GitScmSupport.getObjects());
-    add(SvnScmSupport.getObjects());
+      TravisCi.class,
 
-    add(DefaultProjectSettingsLoader.class,
+      DefaultProjectSettingsLoader.class,
       DefaultActiveRulesLoader.class,
       DefaultQualityProfileLoader.class,
       DefaultProjectRepositoriesLoader.class,
       DefaultLanguagesLoader.class,
-      DefaultLanguagesRepository.class);
+      DefaultLanguagesRepository.class,
+
+      DefaultFeatureFlagsLoader.class,
+      DefaultFeatureFlagsRepository.class);
+
+    add(GitScmSupport.getObjects());
+    add(SvnScmSupport.getObjects());
   }
 
   static ExtensionMatcher getScannerProjectExtensionsFilter() {