svn commit: r1747991 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[rfscholte]

Author: rfscholte
Date: Sun Jun 12 12:40:31 2016
New Revision: 1747991

URL: http://svn.apache.org/viewvc?rev=1747991&view=rev
Log:
[MJAVADOC-456] Upgrade to Maven3 plugin
resolve artifact with coordinate instead of artifactFactory based artifact

Modified:
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1747991&r1=1747990&r2=1747991&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Sun Jun 12 12:40:31 2016
@@ -58,6 +58,7 @@ import org.apache.commons.lang.SystemUti
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -314,6 +315,9 @@ public abstract class AbstractJavadocMoj
     private org.apache.maven.shared.artifact.resolve.ArtifactResolver 
artifactResolver;
     
     @Component
+    private ArtifactHandlerManager artifactHandlerManager;
+    
+    @Component
     private DependencyResolver dependencyResolver;
 
     /**
@@ -2634,18 +2638,21 @@ public abstract class AbstractJavadocMoj
     public Artifact resolveDependency( Dependency dependency )
         throws MavenReportException
     {
-        Artifact artifact = factory.createArtifactWithClassifier( 
dependency.getGroupId(), dependency.getArtifactId(),
-                                                                  
dependency.getVersion(), dependency.getType(),
-                                                                  
dependency.getClassifier() );
+        DefaultArtifactCoordinate coordinate = new DefaultArtifactCoordinate();
+        coordinate.setGroupId( dependency.getGroupId() );
+        coordinate.setArtifactId( dependency.getArtifactId() );
+        coordinate.setVersion( dependency.getVersion() );
+        coordinate.setClassifier( dependency.getClassifier() );
+        coordinate.setExtension( artifactHandlerManager.getArtifactHandler( 
dependency.getType() ).getExtension() );
+        
         try
         {
-            artifact = artifactResolver.resolveArtifact( 
session.getProjectBuildingRequest(), artifact ).getArtifact();
+            return artifactResolver.resolveArtifact( 
session.getProjectBuildingRequest(), coordinate ).getArtifact();
         }
         catch ( ArtifactResolverException e )
         {
             throw new MavenReportException( "artifact resolver problem - " + 
e.getMessage(), e );
         }
-        return artifact;
     }