Revert "SONAR-5735 Deprecate "sonar.importSources""

This reverts commit bdf9dacf8492e93e86f55b832b397e74c8205561.

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
index 6492058df7426dd2b790f964c1fcb3ef292e135f..65a7585555e09fd73f273d60917f05a525f59631 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
@@ -67,8 +67,7 @@ public class ComponentIndexer implements BatchComponent {
 
     boolean shouldImportSource = settings.getBoolean(CoreProperties.CORE_IMPORT_SOURCES_PROPERTY);
     if (!shouldImportSource) {
-      LOG.warn("/!\\ Property '" + CoreProperties.CORE_IMPORT_SOURCES_PROPERTY
-        + "' is deprecated. Not importing source will prevent issues to be properly tracked between consecutive analyses.");
+      LOG.warn("Not importing source will prevent issues to be properly tracked between consecutive analyses");
     }
     for (InputFile inputFile : fs.inputFiles(fs.predicates().all())) {
       String languageKey = inputFile.language();

diff --git a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
index 8564ce61a049094cd94aab308bec7701ea764f99..39157443966cff0b09871936bc28b8c83afc9c4d 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
@@ -38,7 +38,7 @@ class SecurityProperties {
       PropertyDefinition.builder(CoreProperties.CORE_IMPORT_SOURCES_PROPERTY)
         .defaultValue("" + CoreProperties.CORE_IMPORT_SOURCES_DEFAULT_VALUE)
         .name("Import sources")
-        .description("[DEPRECATED] Set to false if sources should not be imported and therefore not available in the Web UI (e.g. for security reasons).")
+        .description("Set to false if sources should not be imported and therefore not available in the Web UI (e.g. for security reasons).")
         .type(PropertyType.BOOLEAN)
         .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE)
         .category(CoreProperties.CATEGORY_SECURITY)
@@ -74,7 +74,7 @@ class SecurityProperties {
         .type(PropertyType.BOOLEAN)
         .category(CoreProperties.CATEGORY_SECURITY)
         .build()
-      );
+    );
 
   }
 }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
index ac0d98fc03f8c22bdcfbbe1d916450ad1b1d8af6..ad7cc9a97ace742893fd107cbcb31f52ddcfae26 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
@@ -193,10 +193,6 @@ public interface CoreProperties {
   String CORE_VIOLATION_LOCALE_PROPERTY = "sonar.violationLocale";
 
   String CORE_VIOLATION_LOCALE_DEFAULT_VALUE = "en";
-  /**
-   * @deprecated since 4.5.1.
-   */
-  @Deprecated
   String CORE_IMPORT_SOURCES_PROPERTY = "sonar.importSources";
   boolean CORE_IMPORT_SOURCES_DEFAULT_VALUE = true;