2 files changed, 28 insertions, 70 deletions
diff --git a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMaven2ProjectBuilder.java b/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMaven2ProjectBuilder.java
deleted file mode 100644
index 6ec6ea0704a..00000000000
--- a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMaven2ProjectBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.sonar.maven;
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.MavenProject;
-import org.sonar.api.batch.bootstrap.ProjectBuilder;
-import org.sonar.api.batch.bootstrap.ProjectBuilderContext;
-import org.sonar.batch.scan.maven.MavenProjectConverter;
-
-import java.util.List;
-
-public class SonarMaven2ProjectBuilder extends ProjectBuilder {
-
-  private MavenSession session;
-
-  public SonarMaven2ProjectBuilder(MavenSession session) {
-    this.session = session;
-  }
-
-  @Override
-  public void build(ProjectBuilderContext context) {
-    List<MavenProject> sortedProjects = session.getSortedProjects();
-    MavenProject topLevelProject = null;
-    for (MavenProject project : sortedProjects) {
-      if (project.isExecutionRoot()) {
-        topLevelProject = project;
-        break;
-      }
-    }
-    MavenProjectConverter.configure(context.getProjectReactor().getRoot(), sortedProjects, topLevelProject);
-  }
-
-}
diff --git a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java b/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java
index c5215e28a85..ffce333b4c3 100644
--- a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java
+++ b/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java
@@ -19,8 +19,7 @@
  */
 package org.sonar.maven;
 
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
+import com.google.common.collect.Maps;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -35,14 +34,12 @@ import org.apache.maven.plugin.PluginManager;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
-import org.sonar.api.batch.maven.MavenUtils;
+import org.sonar.api.batch.bootstrap.ProjectDefinition;
+import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.batch.scan.maven.MavenProjectConverter;
-import org.sonar.runner.api.EmbeddedRunner;
-import org.sonar.runner.api.RunnerProperties;
-import org.sonar.runner.api.ScanProperties;
-
-import java.util.Map.Entry;
-import java.util.Set;
+import org.sonar.batch.bootstrapper.Batch;
+import org.sonar.batch.bootstrapper.EnvironmentInformation;
+import org.sonar.batch.bootstrapper.LoggingConfiguration;
 
 /**
  * @goal sonar
@@ -137,39 +134,32 @@ public final class SonarMojo extends AbstractMojo {
   private RuntimeInformation runtimeInformation;
 
   public void execute() throws MojoExecutionException, MojoFailureException {
+    ProjectDefinition def = MavenProjectConverter.convert(session.getSortedProjects(), project);
+    ProjectReactor reactor = new ProjectReactor(def);
+
+    Batch batch = Batch.builder()
+      .setEnvironment(getEnvironmentInformation())
+      .setProjectReactor(reactor)
+      .addComponents(
+        session, getLog(), lifecycleExecutor, pluginManager, artifactFactory,
+        localRepository, artifactMetadataSource, artifactCollector, dependencyTreeBuilder,
+        projectBuilder, Maven2PluginExecutor.class)
+      .build();
+
+    configureLogging(batch.getLoggingConfiguration());
+    batch.execute();
+  }
 
-    EmbeddedRunner runner = EmbeddedRunner.create()
-        .setApp("Maven", getMavenVersion());
-    // Workaround for SONARPLUGINS-2947
-    // TODO remove when it will be fixed
-    runner.setProperty("sonarRunner.userAgent", "Maven");
-    runner.setProperty("sonarRunner.userAgentVersion", getMavenVersion());
-    Set<Entry<Object, Object>> properties = project.getModel().getProperties().entrySet();
-    for (Entry<Object, Object> entry : properties) {
-      runner.setProperty(ObjectUtils.toString(entry.getKey()), ObjectUtils.toString(entry.getValue()));
-    }
-    String encoding = MavenUtils.getSourceEncoding(project);
-    if (encoding != null) {
-      runner.setProperty(ScanProperties.PROJECT_SOURCE_ENCODING, encoding);
-    }
-    runner.setProperty(ScanProperties.PROJECT_KEY, MavenProjectConverter.getSonarKey(project))
-        .setProperty(RunnerProperties.WORK_DIR, MavenProjectConverter.getSonarWorkDir(project).getAbsolutePath())
-        .setProperty(ScanProperties.PROJECT_BASEDIR, project.getBasedir().getAbsolutePath())
-        .setProperty(ScanProperties.PROJECT_VERSION, StringUtils.defaultString(project.getVersion()))
-        .setProperty(ScanProperties.PROJECT_NAME, StringUtils.defaultString(project.getName()))
-        .setProperty(ScanProperties.PROJECT_DESCRIPTION, StringUtils.defaultString(project.getDescription()))
-        .setProperty(ScanProperties.PROJECT_SOURCE_DIRS, ".")
-        // Required to share ProjectBuilder extension between SonarMavenProjectBuilder and Sonar classloader
-        .setUnmaskedPackages("org.sonar.api.batch.bootstrap")
-        .addExtensions(session, getLog(), lifecycleExecutor, artifactFactory, localRepository, artifactMetadataSource, artifactCollector,
-            dependencyTreeBuilder, projectBuilder, Maven2PluginExecutor.class, new SonarMaven2ProjectBuilder(session));
+  private void configureLogging(LoggingConfiguration logging) {
+    logging.setProperties(Maps.fromProperties(session.getExecutionProperties()));
+    logging.setFormat(LoggingConfiguration.FORMAT_MAVEN);
     if (getLog().isDebugEnabled()) {
-      runner.setProperty("sonar.verbose", "true");
+      logging.setVerbose(true);
     }
-    runner.execute();
   }
 
-  private String getMavenVersion() {
-    return runtimeInformation.getApplicationVersion().toString();
+  private EnvironmentInformation getEnvironmentInformation() {
+    String mavenVersion = runtimeInformation.getApplicationVersion().toString();
+    return new EnvironmentInformation("Maven", mavenVersion);
   }
 }