Author: rfscholte
Date: Thu May 2 19:09:57 2013
New Revision: 1478492
URL: http://svn.apache.org/r1478492
Log:
Simplify code to get the artifact of a pluginDescriptor
Remove ArtifactFactory, which has been removed since M3
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1478492&r1=1478491&r2=1478492&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
(original)
+++
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Thu May 2 19:09:57 2013
@@ -19,8 +19,25 @@ package org.apache.maven.plugins.pdf;
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.swing.text.AttributeSet;
+
+import org.apache.commons.io.input.XmlStreamReader;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -37,7 +54,6 @@ import org.apache.maven.doxia.document.D
import org.apache.maven.doxia.document.io.xpp3.DocumentXpp3Writer;
import org.apache.maven.doxia.index.IndexEntry;
import org.apache.maven.doxia.index.IndexingSink;
-import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.module.xdoc.XdocSink;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
@@ -86,26 +102,8 @@ import org.codehaus.plexus.util.PathTool
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
-import org.apache.commons.io.input.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import javax.swing.text.AttributeSet;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
/**
* Generates a PDF document for a project.
*
@@ -179,14 +177,6 @@ public class PdfMojo
private Doxia doxia;
/**
- * Factory for creating artifact objects.
- *
- * @since 1.1
- */
- @Component
- private ArtifactFactory artifactFactory;
-
- /**
* Project builder.
*
* @since 1.1
@@ -1541,13 +1531,9 @@ public class PdfMojo
*/
private MavenProject getReportPluginProject( PluginDescriptor
pluginDescriptor )
{
- Artifact artifact =
- artifactFactory.createProjectArtifact(
pluginDescriptor.getGroupId(),
-
pluginDescriptor.getArtifactId(),
-
pluginDescriptor.getVersion(), Artifact.SCOPE_COMPILE );
try
{
- return mavenProjectBuilder.buildFromRepository( artifact,
remoteRepositories, localRepository );
+ return mavenProjectBuilder.buildFromRepository(
pluginDescriptor.getPluginArtifact(), remoteRepositories, localRepository );
}
catch ( ProjectBuildingException e )
{
