From 864fbd29e2d21a1db94dfe875510616afa7f2b98 Mon Sep 17 00:00:00 2001
From: John Dennis Casey <jdcasey@apache.org>
Date: Wed, 12 Jul 2006 16:31:25 +0000
Subject: [PATCH] Consolidating modello plugin configuration into parent-pom
 within pluginManagement.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421308 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-embedder/pom.xml                        |  2 ++
 maven-model/pom.xml                           | 19 ----------------
 maven-plugin-descriptor/pom.xml               | 17 --------------
 maven-plugin-parameter-documenter/pom.xml     | 18 +--------------
 .../maven-plugin-tools-model/pom.xml          | 17 --------------
 maven-repository-metadata/pom.xml             | 18 ---------------
 maven-settings/pom.xml                        | 17 --------------
 pom.xml                                       | 22 +++++++++++++++++++
 8 files changed, 25 insertions(+), 105 deletions(-)

diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 6268b00767..8f27abe0c9 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -50,6 +50,7 @@
   </dependencies>
   <reporting>
     <plugins>
+<!--
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
@@ -62,6 +63,7 @@
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
       </plugin>
+ -->
     </plugins>
   </reporting>
 </project>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 2290bb81b8..1b93f285a5 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -32,24 +32,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-8</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>site-xsd</id>
-            <phase>site</phase>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <version>4.0.0</version>
           <model>maven.mdo</model>
@@ -65,7 +47,6 @@
           <plugin>
             <groupId>org.codehaus.modello</groupId>
             <artifactId>modello-maven-plugin</artifactId>
-            <version>1.0-alpha-8</version>
             <executions>
               <execution>
                 <id>v3</id>
diff --git a/maven-plugin-descriptor/pom.xml b/maven-plugin-descriptor/pom.xml
index 68acdc3446..4bd07583f1 100755
--- a/maven-plugin-descriptor/pom.xml
+++ b/maven-plugin-descriptor/pom.xml
@@ -31,23 +31,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-7</version>
-        <executions>
-          <execution>
-            <id>site-xsd</id>
-            <phase>site</phase>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <goals>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <model>src/main/mdo/lifecycle.mdo</model>
           <version>1.0.0</version>
diff --git a/maven-plugin-parameter-documenter/pom.xml b/maven-plugin-parameter-documenter/pom.xml
index 071a69a00a..128d5b3411 100644
--- a/maven-plugin-parameter-documenter/pom.xml
+++ b/maven-plugin-parameter-documenter/pom.xml
@@ -31,24 +31,8 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-7</version>
         <executions>
-          <execution>
-            <id>site-xsd</id>
-            <phase>site</phase>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>base</id>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-            </goals>
-          </execution>
-          <execution>
+         <execution>
             <id>xsd</id>
             <phase>generate-sources</phase>
             <goals>
diff --git a/maven-plugin-tools/maven-plugin-tools-model/pom.xml b/maven-plugin-tools/maven-plugin-tools-model/pom.xml
index ec73e75b2c..a0ff965f34 100755
--- a/maven-plugin-tools/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-model/pom.xml
@@ -31,23 +31,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>site-xsd</id>
-            <phase>site</phase>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <goals>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <model>src/main/mdo/plugin-metadata.mdo</model>
           <version>1.0.0</version>
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 8b82eb74b1..80440f36d8 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -32,24 +32,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-7</version>
-        <executions>
-          <execution>
-            <id>site-xsd</id>
-            <phase>site</phase>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <version>1.0.0</version>
           <model>src/main/mdo/metadata.mdo</model>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index bf010b696a..a641b78d1b 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -31,23 +31,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-7</version>
-        <executions>
-          <execution>
-            <id>site-xsd</id>
-            <phase>site</phase>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-          <execution>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <version>1.0.0</version>
           <model>settings.mdo</model>
diff --git a/pom.xml b/pom.xml
index 205f11066f..3e56a1db3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,28 @@
             <tagBase>https://svn.apache.org/repos/asf/maven/components/tags</tagBase>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.modello</groupId>
+          <artifactId>modello-maven-plugin</artifactId>
+          <version>1.0-alpha-8</version>
+          <executions>
+            <execution>
+              <id>site-docs</id>
+              <phase>pre-site</phase>
+              <goals>
+                <goal>xdoc</goal>
+                <goal>xsd</goal>
+              </goals>
+            </execution>
+            <execution>
+              <goals>
+                <goal>java</goal>
+                <goal>xpp3-reader</goal>
+                <goal>xpp3-writer</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>