From eae7151086efcdbcd91945e7cbe28e1a76e186ef Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 10 Dec 2018 17:21:24 +0100 Subject: [PATCH] SONAR-11508 Update the message --- .../java/org/sonar/scanner/scan/filesystem/FileIndexer.java | 5 +++-- .../sonar/scanner/mediumtest/fs/FileSystemMediumTest.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 c57fc4e9877..2eeecf9c000 100644 --- 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 @@ -108,8 +108,9 @@ public class FileIndexer { } if (!moduleExclusionFilters.accept(realAbsoluteFile, moduleRelativePath, type)) { 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."); + warnOnceDeprecatedExclusion( + "Specifying module-relative paths at project level in the files exclusions/inclusions properties is deprecated. " + + "To continue excluding files like '" + projectRelativePath + "' from the analysis, update this property so that patterns 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 20f8754b038..49e23ec62aa 100644 --- 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 @@ -575,8 +575,8 @@ public class FileSystemMediumTest { assertThat(fileB).isNull(); assertThat(logTester.logs(LoggerLevel.WARN)) - .contains("File 'moduleA/src/sample.xoo' 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."); + .contains("Specifying module-relative paths at project level in the files exclusions/inclusions properties is deprecated. " + + "To continue excluding files like 'moduleA/src/sample.xoo' from the analysis, update this property so that patterns refer to project-relative paths."); } @Test -- 2.39.5