SONAR-2881 Do not rebuild the WAR file when changing conf/logback.xml

2 files changed, 2 insertions, 2 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/config/BatchSettingsEnhancer.java b/sonar-batch/src/main/java/org/sonar/batch/config/BatchSettingsEnhancer.java
index a770fa64adf..ec6030cf747 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/config/BatchSettingsEnhancer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/config/BatchSettingsEnhancer.java
@@ -44,7 +44,7 @@ public final class BatchSettingsEnhancer {
   public void start() {
     String projectKey = reactor.getRoot().getKey();
     setIfNotDefined(ConfigurationUtils.getProjectProperties(dbFactory, projectKey));
-    setIfNotDefined(ConfigurationUtils.getGlobalProperties(dbFactory));
+    setIfNotDefined(ConfigurationUtils.getGeneralProperties(dbFactory));
     settings.updateDeprecatedCommonsConfiguration();
   }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java b/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java
index 4fcc837791b..ca5e52ff96d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/config/ProjectSettings.java
@@ -73,7 +73,7 @@ public class ProjectSettings extends Settings {
   }
 
   private void loadDatabaseGlobalSettings() {
-    List<Property> props = ConfigurationUtils.getGlobalProperties(dbFactory);
+    List<Property> props = ConfigurationUtils.getGeneralProperties(dbFactory);
     for (Property dbProperty : props) {
       setProperty(dbProperty.getKey(), dbProperty.getValue());
     }