Use Properties in ProjectDefinition instead of Configuration

2 files changed, 8 insertions, 6 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/ProjectTree.java b/sonar-batch/src/main/java/org/sonar/batch/ProjectTree.java
index 0381c71f8f2..444cebde88c 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/ProjectTree.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/ProjectTree.java
@@ -63,16 +63,18 @@ public class ProjectTree {
   private static MavenProject createInMemoryPom(ProjectDefinition project) {
     MavenProject pom = new MavenProject();
 
-    String key = project.getProperties().getString("project.key"); // TODO constant
+    String key = project.getProperties().getProperty("project.key"); // TODO constant
     String[] keys = key.split(":");
     pom.setGroupId(keys[0]);
     pom.setArtifactId(keys[1]);
     pom.setVersion("0.1-SNAPSHOT"); // TODO hard-coded value
 
+    pom.getModel().setProperties(project.getProperties());
+
     pom.setArtifacts(Collections.EMPTY_SET);
 
     // Configure fake directories
-    String buildDirectory = project.getProperties().getString("project.build.directory");
+    String buildDirectory = project.getProperties().getProperty("project.build.directory");
     File sonarDir = new File(buildDirectory, "sonar");
     pom.setFile(new File(sonarDir, "fake-pom.xml"));
     pom.getBuild().setDirectory(buildDirectory);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/ProjectDefinition.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/ProjectDefinition.java
index a5546d500b9..b2f7b5f8ca5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/ProjectDefinition.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrapper/ProjectDefinition.java
@@ -20,10 +20,10 @@
 package org.sonar.batch.bootstrapper;
 
 import com.google.common.collect.Lists;
-import org.apache.commons.configuration.Configuration;
 
 import java.io.File;
 import java.util.List;
+import java.util.Properties;
 
 /**
  * Defines project in a form suitable to bootstrap Sonar batch.
@@ -35,7 +35,7 @@ import java.util.List;
 public class ProjectDefinition {
 
   private File baseDir;
-  private Configuration properties;
+  private Properties properties;
   private List<String> sourceDirs = Lists.newArrayList();
   private List<String> testDirs = Lists.newArrayList();
 
@@ -43,7 +43,7 @@ public class ProjectDefinition {
    * @param baseDir project base directory
    * @param properties project properties
    */
-  public ProjectDefinition(File baseDir, Configuration properties) {
+  public ProjectDefinition(File baseDir, Properties properties) {
     this.baseDir = baseDir;
     this.properties = properties;
   }
@@ -52,7 +52,7 @@ public class ProjectDefinition {
     return baseDir;
   }
 
-  public Configuration getProperties() {
+  public Properties getProperties() {
     return properties;
   }