You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2014/03/31 23:23:15 UTC
svn commit: r1583469 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
Author: jdcasey
Date: Mon Mar 31 21:23:15 2014
New Revision: 1583469
URL: http://svn.apache.org/r1583469
Log:
[MJAVADOC-389] Use Project's managed version map when resolving javadoc resource bundles and source jars.
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java?rev=1583469&r1=1583468&r2=1583469&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java Mon Mar 31 21:23:15 2014
@@ -342,9 +342,12 @@ public final class ResourceResolver
}
final ArtifactResolver resolver = config.artifactResolver();
-
+
+ @SuppressWarnings( "rawtypes" )
+ Map managed = config.project().getManagedVersionMap();
+
final ArtifactResolutionResult resolutionResult = resolver.resolveTransitively(
- artifactSet, pomArtifact, localRepo, remoteRepos, metadataSource, resolutionFilter );
+ artifactSet, pomArtifact, managed, localRepo, remoteRepos, metadataSource, resolutionFilter );
final List<String> result = new ArrayList<String>( artifacts.size() );
for ( final Artifact a : (Collection<Artifact>) resolutionResult.getArtifacts() )