From 8d720c63aac96b683c3fa3935fb3e814e1020e7c Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 12 Feb 2006 13:48:06 +0000
Subject: [PATCH] Fix main site creation

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@377177 13f79535-47bb-0310-9956-ffa450edef68
---
 plugins-parent/maven.xml | 14 ++------------
 plugins-site/maven.xml   |  9 +++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/plugins-parent/maven.xml b/plugins-parent/maven.xml
index 278d350f..99e387ba 100644
--- a/plugins-parent/maven.xml
+++ b/plugins-parent/maven.xml
@@ -1,6 +1,6 @@
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,20 +42,10 @@
       <j:set var="executionDir" value="${basedir}" />
     </j:if>
     <maven:maven
-      descriptor="${executionDir}/../project.xml"
+      descriptor="${executionDir}/../plugins-site/project.xml"
       goals="confirm-and-deploy-site"
       ignoreFailures="false"
     />
   </postGoal>
-  
-  <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"/>
-      <j:if test="${ok == 'y'}">
-        <attainGoal name="multiproject:site"/>
-        <attainGoal name="site:sshdeploy"/>
-      </j:if>
-    </j:if>
-  </goal>
 
 </project>
diff --git a/plugins-site/maven.xml b/plugins-site/maven.xml
index 1ecf0a0c..832065ad 100644
--- a/plugins-site/maven.xml
+++ b/plugins-site/maven.xml
@@ -27,6 +27,15 @@
     <attainGoal name="multiproject:site"/>
     <attainGoal name="site:deploy"/>
   </goal>
+  <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"/>
+      <j:if test="${ok == 'y'}">
+        <attainGoal name="multiproject:site"/>
+        <attainGoal name="site:sshdeploy"/>
+      </j:if>
+    </j:if>
+  </goal>
   <postGoal name="site">
     <ant:move file="${maven.docs.dest}/projects-overview.html" tofile="${maven.docs.dest}/index.html"/>
   </postGoal>