summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/sonar/runner/Main.java
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-06-27 09:02:41 +0000
committerSimon Brandhof <simon.brandhof@gmail.com>2011-06-27 09:02:41 +0000
commit9aa05453364c7d7c6946f6e6efbef5d1de01c9e7 (patch)
tree7576329cc54447e0ae37df2f1464e4226b62075a /src/main/java/org/sonar/runner/Main.java
parent9132e3292b142d7dbb5d89cb1973d9e09628bffe (diff)
downloadsonar-scanner-cli-9aa05453364c7d7c6946f6e6efbef5d1de01c9e7.tar.gz
sonar-scanner-cli-9aa05453364c7d7c6946f6e6efbef5d1de01c9e7.zip
SONARPLUGINS-1220 Runner home must be optional
Diffstat (limited to 'src/main/java/org/sonar/runner/Main.java')
-rw-r--r--src/main/java/org/sonar/runner/Main.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/org/sonar/runner/Main.java b/src/main/java/org/sonar/runner/Main.java
index f935d5f..1eb8b77 100644
--- a/src/main/java/org/sonar/runner/Main.java
+++ b/src/main/java/org/sonar/runner/Main.java
@@ -51,11 +51,10 @@ public final class Main {
}
static Properties loadProperties(String[] args) {
- Properties props = new Properties();
- Properties commandLineProps = parseArguments(args);
- props.putAll(loadRunnerProperties(commandLineProps));
- props.putAll(loadProjectProperties(commandLineProps));
- props.putAll(commandLineProps);
+ Properties props = parseArguments(args);
+ props.putAll(System.getProperties());
+ props.putAll(loadRunnerProperties(props));
+ props.putAll(loadProjectProperties(props));
return props;
}