SONAR-5035 Trim properties read from sonar-runner configuration files

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/DefaultProjectBootstrapper.java b/sonar-batch/src/main/java/org/sonar/batch/scan/DefaultProjectBootstrapper.java
index c84b9d5a2f103cc98d641db51fa2fd557b3a6062..528891fadc8c92b84974e76352c22585d294413c 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/DefaultProjectBootstrapper.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/DefaultProjectBootstrapper.java
@@ -277,6 +277,10 @@ class DefaultProjectBootstrapper implements ProjectBootstrapper {
     } finally {
       IOUtils.closeQuietly(fileInputStream);
     }
+    // Trim properties
+    for (String propKey : propsFromFile.stringPropertyNames()) {
+      propsFromFile.setProperty(propKey, StringUtils.trim(propsFromFile.getProperty(propKey)));
+    }
     return propsFromFile;
   }
 

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/module1/sonar-project.properties b/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
index 0138e27b0050e653784f4b8ff184ef92a04fbb49..ec642a9443ae3233aafb989e1ccde496e4505372 100644 (file)
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
+++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
@@ -1,4 +1,4 @@
-sonar.projectKey=com.foo.project.module1
+sonar.projectKey=com.foo.project.module1 
 sonar.projectName=Foo Module 1
-sonar.projectDescription=Description of Module 1
+sonar.projectDescription=Description of Module 1 
 sonar.sources=sources

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/sonar-project.properties b/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/sonar-project.properties
index df58736407774ea6c2d6a480e18a59e642423109..2f16886c91d1b8584af3e89397184ecee87dcda6 100644 (file)
--- a/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/sonar-project.properties
+++ b/sonar-batch/src/test/resources/org/sonar/batch/scan/DefaultProjectBootstrapperTest/multi-module-definitions-in-each-module/sonar-project.properties
@@ -1,7 +1,7 @@
-sonar.projectKey=com.foo.project
+sonar.projectKey=com.foo.project 
 sonar.projectName=Foo Project
 sonar.projectVersion=1.0-SNAPSHOT
-sonar.projectDescription=Description of Foo Project
+sonar.projectDescription=Description of Foo Project 
 
 sonar.tests=tests
 sonar.binaries=target/classes