SONAR-11508 Revert the warning when people uses module level properties

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java
index 304f49ef6242f1bccea5fbe22eeadcfba0a461d3..4b801455774a1b4665c45e93e8dab68778ec5f08 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java
@@ -110,10 +110,6 @@ public class FileIndexer {
       if (projectExclusionFilters.equals(moduleExclusionFilters)) {
         warnOnceDeprecatedExclusion("File '" + projectRelativePath + "' was excluded because patterns are still evaluated using module relative paths but this is deprecated. " +
           "Please update file inclusion/exclusion configuration so that patterns refer to project relative paths.");
-      } else {
-        warnOnceDeprecatedExclusion("Defining inclusion/exclusions at module level is deprecated. " +
-          "Move file inclusion/exclusion configuration from module '" + module.getName() + "' " +
-          "to the root project and update patterns to refer to project relative paths.");
       }
       excludedByPatternsCount.incrementAndGet();
       return;

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
index 608028aad12784b0da769821f33b9bbdcdd69c6d..211f289ec9fe0845ff992b8b13f71542face185b 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
@@ -579,45 +579,6 @@ public class FileSystemMediumTest {
       "Please update file inclusion/exclusion configuration so that patterns refer to project relative paths.");
   }
 
-  @Test
-  public void warn_user_for_outdated_module_exclusions_for_multi_module_project() throws IOException {
-
-    File baseDir = temp.getRoot();
-    File baseDirModuleA = new File(baseDir, "moduleA");
-    File baseDirModuleB = new File(baseDir, "moduleB");
-    File srcDirA = new File(baseDirModuleA, "src");
-    srcDirA.mkdirs();
-    File srcDirB = new File(baseDirModuleB, "src");
-    srcDirB.mkdirs();
-
-    File xooFileA = new File(srcDirA, "sample.xoo");
-    FileUtils.write(xooFileA, "Sample xoo\ncontent", StandardCharsets.UTF_8);
-
-    File xooFileB = new File(srcDirB, "sample.xoo");
-    FileUtils.write(xooFileB, "Sample xoo\ncontent", StandardCharsets.UTF_8);
-
-    AnalysisResult result = tester.newAnalysis()
-      .properties(ImmutableMap.<String, String>builder()
-        .put("sonar.task", "scan")
-        .put("sonar.projectBaseDir", baseDir.getAbsolutePath())
-        .put("sonar.projectKey", "com.foo.project")
-        .put("sonar.sources", "src")
-        .put("sonar.modules", "moduleA,moduleB")
-        .put("moduleB.sonar.exclusions", "src/sample.xoo")
-        .build())
-      .execute();
-
-    InputFile fileA = result.inputFile("moduleA/src/sample.xoo");
-    assertThat(fileA).isNotNull();
-
-    InputFile fileB = result.inputFile("moduleB/src/sample.xoo");
-    assertThat(fileB).isNull();
-
-    assertThat(logTester.logs(LoggerLevel.WARN))
-      .contains("Defining inclusion/exclusions at module level is deprecated. " +
-        "Move file inclusion/exclusion configuration from module 'moduleB' to the root project and update patterns to refer to project relative paths.");
-  }
-
   @Test
   public void failForDuplicateInputFile() throws IOException {
     File srcDir = new File(baseDir, "src");