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

Fix javadoc:jar so that it uses build dir

Browse Source 
Submitted by:	Raphael Philipe Mendes da Silva

Add test to ensure javadoc:jar works


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115196 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dion 2004-05-07 02:22:52 +00:00
parent eb34962af6
commit 85fba4adf0
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javadoc/plugin.jelly
View File

@ -306,7 +306,7 @@
<!--==================================================================-->
<goal name="javadoc:jar" prereqs="javadoc">
<j:set var="maven.javadoc.final.name"
value="${maven.war.build.dir}/${maven.final.name}_javadoc.jar" />
value="${maven.build.dir}/${maven.final.name}_javadoc.jar" />
<ant:jar
destfile="${maven.javadoc.final.name}"
basedir="${maven.javadoc.destdir}"

9
javadoc/src/plugin-test/maven.xml
View File

@ -19,11 +19,18 @@
xmlns:j="jelly:core"
xmlns:assert="assert">
<goal name="testPlugin" prereqs="test-javadoc">
<goal name="testPlugin" prereqs="test-javadoc,test-javadoc-jar">
</goal>
<goal name="test-javadoc">
<delete dir="${maven.build.dir}/docs/apidocs" failonerror="false"/>
<attainGoal name="maven-javadoc-plugin:report"/>
<assert:assertFileExists file="${maven.build.dir}/docs/apidocs/index.html"/>
</goal>
<goal name="test-javadoc-jar">
<delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" failonerror="false"/>
<attainGoal name="javadoc:jar"/>
<assert:assertFileExists file="${maven.build.dir}/${maven.final.name}_javadoc.jar"/>
</goal>
</project>

1
javadoc/xdocs/changes.xml
View File

@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in CVS">
<action dev="dion" type="fix">javadoc:jar changed to place the jar in maven.build.dir</action>
<action dev="dion" type="update">Add plugin test project</action>
<action dev="dion" type="fix" issue="MPJAVADOC-22" due-to="fabrizio giustina">
trim absolute paths to basedir in javadoc report, remove [javadoc] banner