You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/12 09:42:09 UTC
svn commit: r1747972 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml
src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: rfscholte
Date: Sun Jun 12 09:42:09 2016
New Revision: 1747972
URL: http://svn.apache.org/viewvc?rev=1747972&view=rev
Log:
Upgrade maven-common-artifact-filters
Simplify code
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1747972&r1=1747971&r2=1747972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Jun 12 09:42:09 2016
@@ -154,7 +154,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>1.3</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
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=1747972&r1=1747971&r2=1747972&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 09:42:09 2016
@@ -3404,12 +3404,8 @@ public abstract class AbstractJavadocMoj
resolver.resolveTransitively( dependencyArtifacts, artifactProject.getArtifact(),
artifactProject.getRemoteArtifactRepositories(), localRepository,
artifactMetadataSource );
- Set<Artifact> artifacts = result.getArtifacts();
- Map<String, Artifact> compileArtifactMap = new HashMap<String, Artifact>();
- populateCompileArtifactMap( compileArtifactMap, artifacts );
-
- for ( Artifact a : compileArtifactMap.values() )
+ for ( Artifact a : result.getArtifacts() )
{
path.add( a.getFile().getAbsolutePath() );
}