aheritier 2004/06/09 14:54:38
Modified: javadoc plugin.jelly project.xml
javadoc/xdocs changes.xml
Log:
Fix MPJAVADOC-26. The needed flag was incorrect when there was an empty sources
directory.
Revision Changes Path
1.43 +2 -2 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- plugin.jelly 26 May 2004 12:38:27 -0000 1.42
+++ plugin.jelly 9 Jun 2004 21:54:38 -0000 1.43
@@ -98,7 +98,7 @@
<!-- For each directory -->
<j:forEach var="dir" items="${sources.dirs}">
<!-- If we have not already find sources -->
- <j:if test="${needed == null}">
+ <j:if test="${needed != true}">
<!-- We construct the fileset -->
<ant:fileset id="${src.set.counter}" dir="${dir}">
<patternset refid="source.modifications"/>
@@ -210,7 +210,7 @@
<patternset refid="source.modifications"/>
</ant:fileset>
- </j:forEach>--> <!-- dir in maven.compile.src.set -->
+ </j:forEach> <!-- dir in maven.compile.src.set -->
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
<ant:setProperty name="source" value="${maven.javadoc.source}" />
1.37 +0 -2 maven-plugins/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/project.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- project.xml 18 May 2004 21:49:38 -0000 1.36
+++ project.xml 9 Jun 2004 21:54:38 -0000 1.37
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
* limitations under the License.
*/
-->
-
<project>
<extend>../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion>
1.32 +1 -2 maven-plugins/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/changes.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- changes.xml 26 May 2004 12:38:27 -0000 1.31
+++ changes.xml 9 Jun 2004 21:54:38 -0000 1.32
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
* limitations under the License.
*/
-->
-
<document>
<properties>
<title>Changes</title>
@@ -26,6 +24,7 @@
</properties>
<body>
<release version="1.5.1-SNAPSHOT" date="In CVS">
+ <action dev="aheritier" type="fix" issue="MPJAVADOC-26" due-to="Denis
McLaughlin">Fix the needed flag when there's an empty sources directory.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-24">doc-files directories
contents are correctly copied.</action>
<action dev="brett" type="fix" issue="MPJAVADOC-5">Add support for multiple
source directories.</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
