summaryrefslogtreecommitdiffstats
path: root/sonar-batch
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@gmail.com>2013-01-10 09:58:03 +0100
committerJulien Lancelot <julien.lancelot@gmail.com>2013-01-10 09:58:03 +0100
commit874334b82c090f73dd722ceced845ce8273de524 (patch)
tree09de89aeb2a59e6e4d0e2979c16839dd5976ed26 /sonar-batch
parentd31621e9d674a68f9451574fbe706d052c32af73 (diff)
downloadsonarqube-874334b82c090f73dd722ceced845ce8273de524.tar.gz
sonarqube-874334b82c090f73dd722ceced845ce8273de524.zip
SONAR-4032 Add the 'sonar.skippedModules' property to the Settings>Exclusions page
Diffstat (limited to 'sonar-batch')
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
index a46354e9dd2..df2e23337f5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExclusions.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.BatchComponent;
+import org.sonar.api.CoreProperties;
import org.sonar.api.batch.bootstrap.ProjectBuilder;
import org.sonar.api.batch.bootstrap.ProjectDefinition;
import org.sonar.api.batch.bootstrap.ProjectReactor;
@@ -67,12 +68,13 @@ public class ProjectExclusions implements BatchComponent {
if (!isRoot && includedKeys.length > 0) {
excluded = !ArrayUtils.contains(includedKeys, projectKey);
}
+ String skippedModulesProperty = CoreProperties.PROJECT_SKIPPED_MODULES_PROPERTY;
if (!excluded) {
- String[] excludedKeys = settings.getStringArray("sonar.skippedModules");
+ String[] excludedKeys = settings.getStringArray(skippedModulesProperty);
excluded = ArrayUtils.contains(excludedKeys, projectKey);
}
if (excluded && isRoot) {
- throw new IllegalArgumentException("The root project can't be excluded. Please check the parameters sonar.skippedModules and sonar.includedModules.");
+ throw new IllegalArgumentException("The root project can't be excluded. Please check the parameters " + skippedModulesProperty + " and sonar.includedModules.");
}
return excluded;
}