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/07/09 16:50:45 UTC

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

Author: rfscholte
Date: Sat Jul  9 16:50:45 2016
New Revision: 1752024

URL: http://svn.apache.org/viewvc?rev=1752024&view=rev
Log:
[MJAVADOC-456] Upgrade to Maven3 plugin
MultipleArtifactsNotFoundException should never occur anymore with the aggregate goals 

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=1752024&r1=1752023&r2=1752024&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 Sat Jul  9 16:50:45 2016
@@ -65,7 +65,6 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
 import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
@@ -2583,18 +2582,6 @@ public abstract class AbstractJavadocMoj
                                                                        subProject.getRemoteArtifactRepositories(),
                                                                        artifactMetadataSource );
                             }
-                            catch ( MultipleArtifactsNotFoundException e )
-                            {
-                                if ( checkMissingArtifactsInReactor( dependencyArtifacts, e.getMissingArtifacts() ) )
-                                {
-                                    getLog().warn( "IGNORED to add some artifacts in the classpath. See above." );
-                                }
-                                else
-                                {
-                                    // we can't find all the artifacts in the reactor so bubble the exception up.
-                                    throw new MavenReportException( e.getMessage(), e );
-                                }
-                            }
                             catch ( ArtifactNotFoundException e )
                             {
                                 throw new MavenReportException( e.getMessage(), e );