[SCANMAVEN-220] Revert "SCANMAVEN-220: Enable sonar.scanner.scanAll b…

…y default (#219)". To be delivered in a future version. This reverts commit 990c59d
SonarSource · May 28, 2024 · 23439fa · 23439fa
1 parent f4ad3da
commit 23439fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/its/src/test/java/com/sonar/maven/it/suite/MavenTest.java b/its/src/test/java/com/sonar/maven/it/suite/MavenTest.java
@@ -167,8 +167,8 @@ void shouldSupportJeeProjects() {
     ORCHESTRATOR.executeBuild(build);
 
     // src/main/webapp is analyzed by web and xml plugin
-    // scanning all files, so 2 more files (ejb-module/src/main/resources/META-INF/ejb-jar.xml and web-module/src/main/webapp/index.jsp)
-    assertThat(getMeasureAsInteger("com.sonarsource.it.samples.jee:parent", "files")).isEqualTo(10);
+    // including resources, so one more file (ejb-module/src/main/resources/META-INF/ejb-jar.xml)
+    assertThat(getMeasureAsInteger("com.sonarsource.it.samples.jee:parent", "files")).isEqualTo(9);
   }
 
   /**

diff --git a/src/it/java-multi-module/verify.groovy b/src/it/java-multi-module/verify.groovy
@@ -9,4 +9,4 @@ def sources = 'sonar.sources'
 def module1Sources = "org.codehaus.sonar:sample-project-module1.$sources"
 
 assert properties."$module1Sources" == properties."$projectBaseDir" + "/module1/pom.xml"
-assert properties."$sources" == properties."$projectBaseDir" + "/pom.xml" + "," + properties."$projectBaseDir" + "/verify.groovy"
+assert properties."$sources" == properties."$projectBaseDir" + "/pom.xml"
diff --git a/src/main/java/org/sonarsource/scanner/maven/bootstrap/ScannerBootstrapper.java b/src/main/java/org/sonarsource/scanner/maven/bootstrap/ScannerBootstrapper.java
@@ -140,8 +140,7 @@ Map<String, String> collectProperties()
   }
 
   private static boolean shouldCollectAllSources(Properties userProperties) {
-    String sonarScanAll = userProperties.getProperty(MavenScannerProperties.PROJECT_SCAN_ALL_SOURCES, Boolean.TRUE.toString());
-    return Boolean.TRUE.equals(Boolean.parseBoolean(sonarScanAll));
+    return Boolean.TRUE.equals(Boolean.parseBoolean(userProperties.getProperty(MavenScannerProperties.PROJECT_SCAN_ALL_SOURCES)));
   }
 
   private static String notCollectingAdditionalSourcesBecauseOf(String overriddenProperty) {