fixed typos and improved pom content
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1460137 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 60bca46..830f458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,9 +78,37 @@
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+
+ <!-- Sonatype Aether for Maven 3.0.x -->
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>1.7</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ <version>1.7</version>
+ <optional>true</optional>
</dependency>
<!-- test -->
@@ -177,26 +205,6 @@
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-bean</artifactId>
- <version>2.2.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.1.8</version>
@@ -213,12 +221,14 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
index 1e2adfb..b99a4dd 100644
--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
+++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
@@ -29,7 +29,6 @@
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
-import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Plugin;
@@ -49,7 +48,6 @@
import org.apache.maven.plugin.version.PluginVersionResult;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport;
-import org.codehaus.classworlds.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -57,42 +55,44 @@
import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomUtils;
+import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.graph.DependencyFilter;
import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.util.filter.ExclusionsDependencyFilter;
/**
* <p>
* This component will build some {@link MavenReportExecution} from {@link MavenReportExecutorRequest}.
- * If a {@link MavenReport} need to fork a lifecycle, this fork is executed here.
+ * If a {@link MavenReport} needs to fork a lifecycle, this fork is executed here.
* It will ask the core to get some informations in order to correctly setup {@link MavenReport}.
* </p>
* <p>
- * <b>Note</b> if no version is defined in the report plugin the version will be search
+ * <b>Note</b> if no version is defined in the report plugin, the version will be searched
* with method {@link #getPluginVersion(ReportPlugin, RepositoryRequest, MavenReportExecutorRequest)}
* Steps to find a plugin version stop after each step if a non <code>null</code> value has been found:
- * <ul>
- * <li>use the one defined in the reportPlugin configuration</li>
- * <li>search similar (same groupId and artifactId) mojo in the build/plugins section of the pom</li>
- * <li>search similar (same groupId and artifactId) mojo in the build/pluginManagement section of the pom</li>
- * <li>ask {@link PluginVersionResolver} to get a version and display a warning as it's not a recommended use</li>
- * </ul>
+ * <ol>
+ * <li>use the one defined in the reportPlugin configuration,</li>
+ * <li>search similar (same groupId and artifactId) mojo in the build/plugins section of the pom,</li>
+ * <li>search similar (same groupId and artifactId) mojo in the build/pluginManagement section of the pom,</li>
+ * <li>ask {@link PluginVersionResolver} to get a version and display a warning as it's not a recommended use.</li>
+ * </ol>
* </p>
* <p>
- * Following steps are done
+ * Following steps are done:
* <ul>
- * <li>get {@link PluginDescriptor} from the {@link MavenPluginManager#getPluginDescriptor(Plugin, RepositoryRequest)}</li>
+ * <li>get {@link PluginDescriptor} from the {@link MavenPluginManager#getPluginDescriptor(Plugin, RepositoryRequest, RepositorySystemSession)}</li>
* <li>setup a {@link ClassLoader} with the Mojo Site plugin {@link ClassLoader} as parent for the report execution.
- * You must note some classes are imported from the current Site Mojo {@link ClassRealm} see {@link #IMPORTS}.
- * The artifact resolution excludes the following artifacts (with using an {@link ExclusionSetFilter}:
+ * You must note some classes are imported from the current Site Mojo ClassRealm: see {@link #IMPORTS}.
+ * The artifact resolution excludes the following artifacts, corresponding to imported classes:
* doxia-site-renderer, doxia-sink-api, maven-reporting-api.
- * done using {@link MavenPluginManager#setupPluginRealm(PluginDescriptor, org.apache.maven.execution.MavenSession, ClassLoader, List, org.apache.maven.artifact.resolver.filter.ArtifactFilter)}
+ * Done using {@link MavenPluginManager#setupPluginRealm(PluginDescriptor, MavenSession, ClassLoader, List, DependencyFilter)}
* </li>
* <li>
- * setup the mojo using {@link MavenPluginManager#getConfiguredMojo(Class, org.apache.maven.execution.MavenSession, MojoExecution)}
+ * setup the mojo using {@link MavenPluginManager#getConfiguredMojo(Class, MavenSession, MojoExecution)}
* </li>
* <li>
- * verify with {@link LifecycleExecutor#calculateForkedExecutions(MojoExecution, org.apache.maven.execution.MavenSession)}
- * if any forked execution is needed: if yes executes the forked execution here
+ * verify with {@link LifecycleExecutor#calculateForkedExecutions(MojoExecution, MavenSession)}
+ * if any forked execution is needed: if yes, executes the forked execution here
* </li>
* </ul>
* </p>
@@ -124,7 +124,7 @@
"org.apache.maven.doxia.logging.LogEnabled",
"org.apache.maven.doxia.logging.Log" );
- private static final ExclusionsDependencyFilter EXCLUDES =
+ private static final DependencyFilter EXCLUDES =
new ExclusionsDependencyFilter( Arrays.asList( "doxia-site-renderer", "doxia-sink-api", "maven-reporting-api" ) );
public List<MavenReportExecution> buildMavenReports( MavenReportExecutorRequest mavenReportExecutorRequest )
