Author: rfscholte
Date: Sun Jun 12 12:04:55 2016
New Revision: 1747985
URL: http://svn.apache.org/viewvc?rev=1747985&view=rev
Log:
[MJAVADOC-456] Upgrade to Maven3 plugin
Don't pass ArtifactResolutionResult, it will be removed
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.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=1747985&r1=1747984&r2=1747985&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:04:55 2016
@@ -2367,9 +2367,9 @@ public abstract class AbstractJavadocMoj
* @return the compile artifacts from the result
* @see JavadocUtil#getCompileArtifacts(Set, boolean)
*/
- protected List<Artifact> getCompileArtifacts( ArtifactResolutionResult
result )
+ protected List<Artifact> getCompileArtifacts( Collection<Artifact>
artifacts )
{
- return JavadocUtil.getCompileArtifacts( result.getArtifacts(), false );
+ return JavadocUtil.getCompileArtifacts( artifacts, false );
}
// ----------------------------------------------------------------------
@@ -2579,7 +2579,8 @@ public abstract class AbstractJavadocMoj
continue;
}
- populateCompileArtifactMap( compileArtifactMap,
getCompileArtifacts( result ) );
+ populateCompileArtifactMap( compileArtifactMap,
+ getCompileArtifacts(
result.getArtifacts() ) );
if ( getLog().isDebugEnabled() )
{
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=1747985&r1=1747984&r2=1747985&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
Sun Jun 12 12:04:55 2016
@@ -226,7 +226,7 @@ public class JavadocUtil
* @param withTestScope flag to include or not the artifacts with test
scope
* @return list of compile artifacts with or without test scope.
*/
- protected static List<Artifact> getCompileArtifacts( Set<Artifact>
artifacts, boolean withTestScope )
+ protected static List<Artifact> getCompileArtifacts( Collection<Artifact>
artifacts, boolean withTestScope )
{
List<Artifact> list = new ArrayList<Artifact>( artifacts.size() );
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java?rev=1747985&r1=1747984&r2=1747985&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
Sun Jun 12 12:04:55 2016
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.javadoc;
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.plugin.javadoc.resolver.SourceResolverConfig;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -31,6 +30,7 @@ import org.codehaus.plexus.util.StringUt
import java.io.File;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -205,9 +205,9 @@ public class TestJavadocJar
}
@Override
- protected List<Artifact> getCompileArtifacts( ArtifactResolutionResult
result )
+ protected List<Artifact> getCompileArtifacts( Collection<Artifact>
artifacts )
{
- return JavadocUtil.getCompileArtifacts( result.getArtifacts(), true );
+ return JavadocUtil.getCompileArtifacts( artifacts, true );
}
/**
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java?rev=1747985&r1=1747984&r2=1747985&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
Sun Jun 12 12:04:55 2016
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.javadoc;
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.plugin.javadoc.resolver.SourceResolverConfig;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -33,6 +32,7 @@ import org.codehaus.plexus.util.StringUt
import java.io.File;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -310,9 +310,9 @@ public class TestJavadocReport
}
@Override
- protected List<Artifact> getCompileArtifacts( ArtifactResolutionResult
result )
+ protected List<Artifact> getCompileArtifacts( Collection<Artifact>
artifacts )
{
- return JavadocUtil.getCompileArtifacts( result.getArtifacts(), true );
+ return JavadocUtil.getCompileArtifacts( artifacts, true );
}
/**
