Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug when package specified, but no sources in it

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115808 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2004-07-13 12:20:03 +00:00
parent 7a8bc995fe
commit 9e306d3a4f
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
javadoc/plugin.jelly
View File

@ -148,9 +148,15 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
<!-- If we have not already find sources -->
<j:if test="${internal.javadoc.needed != true}">
<!-- We construct the fileset -->
<j:set var="includes" value="**/*.java" />
<util:replace var="packageDir" newChar="/" oldChar="." value="${pom.package}" />
<j:if test="${!empty(packageDir)}">
<j:set var="includes" value="${packageDir}/**/*.java" />
</j:if>
<ant:fileScanner var="sources">
<ant:fileset dir="${dir}" include="**/*.java"/>
<ant:fileset dir="${dir}">
<ant:include name="${includes}" />
</ant:fileset>
</ant:fileScanner>
<j:set var="internal.javadoc.needed" scope="parent"
@ -507,4 +513,4 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
<goal name="javadoc:generate" prereqs="maven-javadoc-plugin:report"/>
<goal name="javadoc" prereqs="maven-javadoc-plugin:report"/>
</project>
</project>

2
javadoc/project.xml
View File

@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-javadoc-plugin</id>
<name>Maven Javadoc Plug-in</name>
<currentVersion>1.6</currentVersion>
<currentVersion>1.6.1-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Produce Javadocs and report</shortDescription>
<url>http://maven.apache.org/reference/plugins/javadoc/</url>

3
javadoc/xdocs/changes.xml
View File

@ -25,6 +25,9 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
<release version="1.6.1-SNAPSHOT" date="in CVS">
<action dev="brett" type="fix">Correct check needed function for when package is given but there are not java files in it.</action>
</release>
<release version="1.6" date="2004-07-09">
<action dev="aheritier" type="fix" issue="MPJAVADOC-33">Javadoc plugin ignores the package specified in the pom.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-32" due-to="Guillaume Nodet">The maven-javadoc-plugin:register failed in javadoc plugin 1.5.1-SNAPSHOT.</action>