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

Rolling back my fix for MPXDOC-181: it breaks projects that declare a pre- or post-goal on any of the modified goals

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@378329 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-02-16 18:26:44 +00:00
parent 9911fa3de7
commit 7c84a85a6e
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xdoc/plugin.jelly
View File

@ -564,7 +564,7 @@
<!-- ================================================================== --> <!-- ================================================================== -->
<goal name="xdoc" <goal name="xdoc"
prereqs="xdoc:init, xdoc:generate-from-pom-noinit, xdoc:transform-noinit" prereqs="xdoc:generate-from-pom, xdoc:transform"
description="Generate html project documentation xdoc sources"/> description="Generate html project documentation xdoc sources"/>
<goal name="xdoc:init" <goal name="xdoc:init"
@ -662,12 +662,8 @@
<goal <goal
name="xdoc:generate-from-pom" name="xdoc:generate-from-pom"
prereqs="xdoc:init, xdoc:generate-from-pom-noinit" prereqs="xdoc:init, xdoc:i18n-validation, xdoc:register-reports"
description="Generates xdocs for site based on project descriptor"/> description="Generates xdocs for site based on project descriptor">
<goal
name="xdoc:generate-from-pom-noinit"
prereqs="xdoc:i18n-validation, xdoc:register-reports">
<echo>Generating xdocs from POM ... </echo> <echo>Generating xdocs from POM ... </echo>
@ -884,12 +880,9 @@
<!-- C O P Y R E S O U R C E S --> <!-- C O P Y R E S O U R C E S -->
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- copy resources needed for xdocs --> <!-- copy resources needed for xdocs -->
<goal name="xdoc:copy-resources" <goal name="xdoc:copy-resources"
prereqs="xdoc:init, xdoc:copy-resources-noinit" prereqs="xdoc:init"
description="copy static resources for use in xdocs generated html"/> description="copy static resources for use in xdocs generated html">
<goal name="xdoc:copy-resources-noinit">
<util:tokenize var="allLocales" delim=", " trim="true">${maven.xdoc.locale.default}, ${maven.xdoc.locale.supported}</util:tokenize> <util:tokenize var="allLocales" delim=", " trim="true">${maven.xdoc.locale.default}, ${maven.xdoc.locale.supported}</util:tokenize>
@ -1004,11 +997,8 @@
<!-- copy user resources --> <!-- copy user resources -->
<!-- Note: this should also prereq xdoc:copy-user-bundles, but that doesn't do anything yet --> <!-- Note: this should also prereq xdoc:copy-user-bundles, but that doesn't do anything yet -->
<goal name="xdoc:copy-user-resources" <goal name="xdoc:copy-user-resources"
prereqs="xdoc:init, xdoc:copy-user-resources-noinit" prereqs="xdoc:init"
description="Copy user provided resources to docs destination"/> description="Copy user provided resources to docs destination">
<goal name="xdoc:copy-user-resources-noinit">
<j:if test="${maven.docs.src.available}"> <j:if test="${maven.docs.src.available}">
<log:info> <log:info>
@ -1113,15 +1103,13 @@
<!-- ================================================================== --> <!-- ================================================================== -->
<goal name="xdoc:transform" <goal name="xdoc:transform"
prereqs="xdoc:init, xdoc:transform-noinit" prereqs="xdoc:init"
description="Generate html project documentation xdoc sources"/> description="Generate html project documentation xdoc sources">
<goal name="xdoc:transform-noinit">
<!-- use JSL in Jelly to build the documentation --> <!-- use JSL in Jelly to build the documentation -->
<attainGoal name="xdoc:copy-resources-noinit"/> <attainGoal name="xdoc:copy-resources"/>
<attainGoal name="xdoc:copy-user-resources-noinit"/> <attainGoal name="xdoc:copy-user-resources"/>
<attainGoal name="xdoc:jelly-transform-noinit"/> <attainGoal name="xdoc:jelly-transform"/>
<xdoc:unGrabClassLoader/> <xdoc:unGrabClassLoader/>
</goal> </goal>
@ -1168,11 +1156,8 @@
</goal> </goal>
<goal name="xdoc:jelly-transform" <goal name="xdoc:jelly-transform"
prereqs="xdoc:init, xdoc:jelly-transform-noinit" prereqs="xdoc:init, xdoc:jelly-init, xdoc:register-reports"
description="transform xdocs using jelly/jsl rather than dvsl"/> description="transform xdocs using jelly/jsl rather than dvsl">
<goal name="xdoc:jelly-transform-noinit"
prereqs="xdoc:jelly-init, xdoc:register-reports">
<j:set var="destdir" value="${maven.docs.dest}"/> <j:set var="destdir" value="${maven.docs.dest}"/>
<j:set var="outputencoding" value="${maven.docs.outputencoding}"/> <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>

1
xdoc/xdocs/changes.xml
View File

@ -28,7 +28,6 @@
<body> <body>
<release version="1.10-SNAPSHOT" date="in SVN"> <release version="1.10-SNAPSHOT" date="in SVN">
<action dev="ltheussl" type="add">Include instructions for ClearCase, Starteam and Perforce access in the scm-usage page.</action> <action dev="ltheussl" type="add">Include instructions for ClearCase, Starteam and Perforce access in the scm-usage page.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-181"><code>xdoc:init</code> was called six times during one <code>xdoc</code> run.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-191">Include dependencies' scope in dependencies page.</action> <action dev="ltheussl" type="add" issue="MPXDOC-191">Include dependencies' scope in dependencies page.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-190">Include the new theme <code>maven-stylus.css</code>.</action> <action dev="ltheussl" type="add" issue="MPXDOC-190">Include the new theme <code>maven-stylus.css</code>.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-189">Document the use of pom settings by the xdoc plugin.</action> <action dev="ltheussl" type="add" issue="MPXDOC-189">Document the use of pom settings by the xdoc plugin.</action>