Author: aheritier
Date: Sun Mar 5 14:48:37 2006
New Revision: 383429
URL: http://svn.apache.org/viewcvs?rev=383429&view=rev
Log:
Remove the goal to create and deploy all sites in one step.
It doesn't work : see MAVEN-1750
You have to run "maven -e plugins:build-all-sites plugins:deploy-all-sites"
from the root directory to do it.
Modified:
maven/maven-1/plugins/trunk/maven.xml
maven/maven-1/plugins/trunk/plugins-site/maven.xml
maven/maven-1/plugins/trunk/plugins-site/project.properties
Modified: maven/maven-1/plugins/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/maven.xml?rev=383429&r1=383428&r2=383429&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/maven.xml (original)
+++ maven/maven-1/plugins/trunk/maven.xml Sun Mar 5 14:48:37 2006
@@ -34,7 +34,4 @@
<goal name="plugins:deploy-all-sites" description="Create and deploy the web
site for all plugins and for the root site">
<maven:maven descriptor="${basedir}/plugins-site/project.xml"
goals="plugins:deploy-all-sites" ignoreFailures="false"/>
</goal>
- <goal name="plugins:build-and-deploy-all-sites" description="Create and
deploy the web site for all plugins and for the root site">
- <maven:maven descriptor="${basedir}/plugins-site/project.xml"
goals="plugins:build-and-deploy-all-sites" ignoreFailures="false"/>
- </goal>
</project>
Modified: maven/maven-1/plugins/trunk/plugins-site/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugins-site/maven.xml?rev=383429&r1=383428&r2=383429&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugins-site/maven.xml (original)
+++ maven/maven-1/plugins/trunk/plugins-site/maven.xml Sun Mar 5 14:48:37 2006
@@ -17,14 +17,13 @@
-->
<project xmlns:ant="jelly:ant" xmlns:i="jelly:interaction"
xmlns:j="jelly:core" xmlns:maven="jelly:maven">
<goal name="plugins:build-all-sites" description="Create the web site for
all plugins and for the root site">
+ <!-- And we generate & deploy the root site -->
+ <attainGoal name="multiproject:site"/>
<!-- We don't use the aggregate mode thus we manually generate all sites
-->
<j:set var="goal" value="site"/>
<attainGoal name="multiproject:goal"/>
- <!-- And we generate & deploy the root site -->
- <attainGoal name="multiproject:site"/>
</goal>
<goal name="plugins:deploy-all-sites" description="Deploy the web site for
all plugins and for the root site">
- <!-- We don't want to have the question about to deploy the root site
after each plugin -->
<maven:get var="method" plugin="maven-site-plugin"
property="maven.site.deploy.method"/>
<!-- And we generate & deploy the root site -->
<attainGoal name="site:${method}deploy"/>
@@ -32,7 +31,6 @@
<j:set var="goal" value="site:${method}deploy"/>
<attainGoal name="multiproject:goal"/>
</goal>
- <goal name="plugins:build-and-deploy-all-sites" description="Build and
deploy the web site for all plugins and for the root site"
prereqs="plugins:build-all-sites,plugins:deploy-all-sites"/>
<goal name="confirm-and-deploy-site">
<j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
<i:ask question="Would you like to regenerate and deploy the main
plugins site (y/n)?" answer="ok" default="y"/>
Modified: maven/maven-1/plugins/trunk/plugins-site/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugins-site/project.properties?rev=383429&r1=383428&r2=383429&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugins-site/project.properties (original)
+++ maven/maven-1/plugins/trunk/plugins-site/project.properties Sun Mar 5
14:48:37 2006
@@ -67,7 +67,7 @@
maven.multiproject.navigation=independent
maven.multiproject.overviewPage.title=Plugins supplied with Maven
maven.multiproject.overviewPage.text=The following Maven plugins are available
as part of the Maven Project. Please refer also to the list of available <a
href="../3rdparty.html">Third Party Plugins</a> and the <a
href="../../plugins-sandbox/index.html">Sandbox</a>.
-maven.multiproject.basedir=${basedir}/../
+maven.multiproject.basedir=${basedir}/..
maven.multiproject.includes=*/project.xml
maven.multiproject.excludes=plugins-parent/project.xml,plugins-site/project.xml,examples/project.xml,touchstone/project.xml,touchstone-partner/project.xml
# We can't create the documention for the xdoc plugin because of the relative
entity bug in Dom4J
