You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ws...@apache.org on 2008/03/03 07:05:17 UTC
svn commit: r632945 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml
src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: wsmoak
Date: Sun Mar 2 22:05:15 2008
New Revision: 632945
URL: http://svn.apache.org/viewvc?rev=632945&view=rev
Log:
[MJAVADOC-137] Revert the addition of @aggregator and other changes from MJAVADOC-104, which fixed a problem with missing javadoc for generated sources.
Unfortunately, adding @aggregator to the javadoc plugin causes too many other problems.
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=632945&r1=632944&r2=632945&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Mar 2 22:05:15 2008
@@ -260,7 +260,7 @@
<projectsDirectory>src/it</projectsDirectory>
<pomIncludes>
<pomInclude>**/MJAVADOC-110/pom.xml</pomInclude>
- <!-- <pomInclude>**/MJAVADOC-137/pom.xml</pomInclude> fails -->
+ <pomInclude>**/MJAVADOC-137/pom.xml</pomInclude>
<pomInclude>**/MJAVADOC-172/pom.xml</pomInclude>
</pomIncludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
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=632945&r1=632944&r2=632945&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 Mar 2 22:05:15 2008
@@ -84,7 +84,6 @@
* @version $Id$
* @since 2.0
* @requiresDependencyResolution compile
- * @aggregator
*/
public abstract class AbstractJavadocMojo
extends AbstractMojo
@@ -1667,11 +1666,6 @@
if ( subProject != project )
{
List sourceRoots = getProjectSourceRoots( subProject );
-
- if ( subProject.getExecutionProject() != null )
- {
- sourceRoots.addAll( getExecutionProjectSourceRoots( subProject ) );
- }
ArtifactHandler artifactHandler = subProject.getArtifact().getArtifactHandler();
if ( "java".equals( artifactHandler.getLanguage() ) )