[MJAVADOC-456] Upgrade to Maven3 plugin
make use of requiresDependencyResolution to get artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1801993 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 1597e50..ee4efc1 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -1814,17 +1814,6 @@
}
/**
- * @param p not null maven project
- * @return the list of artifacts for the given project
- */
- protected List<Artifact> getProjectArtifacts( MavenProject p )
- {
- return ( p.getCompileArtifacts() == null
- ? Collections.<Artifact>emptyList()
- : new LinkedList<Artifact>( p.getCompileArtifacts() ) );
- }
-
- /**
* @return the current javadoc directory
*/
protected File getJavadocDirectory()
@@ -2554,7 +2543,7 @@
classpathElements.addAll( getProjectBuildOutputDirs( project ) );
}
- populateCompileArtifactMap( compileArtifactMap, getProjectArtifacts( project ) );
+ populateCompileArtifactMap( compileArtifactMap, project.getArtifacts() );
if ( isAggregator() && project.isExecutionRoot() )
{
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
index 1362114..736cec2 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
@@ -199,12 +199,6 @@
}
@Override
- protected List<Artifact> getProjectArtifacts( MavenProject p )
- {
- return p.getTestArtifacts();
- }
-
- @Override
protected ScopeFilter getDependencyScopeFilter()
{
return ScopeFilter.including( Artifact.SCOPE_COMPILE, Artifact.SCOPE_PROVIDED, Artifact.SCOPE_SYSTEM,
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
index 6cb6a5a..a7baf93 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
@@ -279,13 +279,6 @@
}
@Override
- protected List<Artifact> getProjectArtifacts( MavenProject p )
- {
- return ( p.getTestArtifacts() == null ? Collections.<Artifact>emptyList()
- : new LinkedList<Artifact>( p.getTestArtifacts() ) );
- }
-
- @Override
protected File getJavadocDirectory()
{
return testJavadocDirectory;
