Author: vsiveton
Date: Fri May 30 15:18:09 2008
New Revision: 661899
URL: http://svn.apache.org/viewvc?rev=661899&view=rev
Log:
MJAVADOC-168: Regression: 2.4-SNAPSHOT does not generate docs for generates
sources if run outside a build
o readded @execute phase="generate-sources" and @execute
phase=generate-test-sources
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.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/JavadocReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=661899&r1=661898&r2=661899&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Fri May 30 15:18:09 2008
@@ -42,7 +42,7 @@
* @version $Id$
* @since 2.0
* @goal javadoc
- * @phase generate-sources
+ * @execute phase="generate-sources"
* @see <a href="http://java.sun.com/j2se/javadoc/";>Javadoc Tool</a>
* @see <a
href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#options";>Javadoc
Options</a>
*/
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=661899&r1=661898&r2=661899&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
Fri May 30 15:18:09 2008
@@ -38,7 +38,7 @@
* @version $Id$
* @since 2.3
* @goal test-javadoc
- * @phase generate-test-sources
+ * @execute phase=generate-test-sources
* @requiresDependencyResolution test
* @see <a href="http://java.sun.com/j2se/javadoc/";>Javadoc Tool</a>
* @see <a
href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#options";>Javadoc
Options </a>
