From 48d853ad6e42d1d94c9e64f08ffaba9e9b8f90e5 Mon Sep 17 00:00:00 2001
From: Herve Boutemy <hboutemy@apache.org>
Date: Sun, 14 Dec 2008 22:07:08 +0000
Subject: [PATCH] [MNG-3898] use models attribute of modello-maven-plugin
 instead of model (merged from 2.0.x branch r726548)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726552 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-compat/pom.xml     |  4 +++-
 maven-core/pom.xml       |  4 +++-
 maven-lifecycle/pom.xml  |  6 ++++--
 maven-model/pom.xml      |  4 +++-
 maven-plugin-api/pom.xml |  4 +++-
 maven-project/pom.xml    | 12 +++++++-----
 maven-toolchain/pom.xml  |  4 +++-
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 7cbcded418..5fe754efbb 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -58,7 +58,9 @@
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/metadata.mdo</model>
+          <models>
+            <model>src/main/mdo/metadata.mdo</model>
+          </models>
         </configuration>
       </plugin>
       <plugin>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index e8e3bbd3b2..343e8b000c 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -126,7 +126,9 @@
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/settings.mdo</model>
+          <models>
+            <model>src/main/mdo/settings.mdo</model>
+          </models>
         </configuration>
       </plugin>
       <plugin>
diff --git a/maven-lifecycle/pom.xml b/maven-lifecycle/pom.xml
index ed3666e428..f1bb07c1d7 100644
--- a/maven-lifecycle/pom.xml
+++ b/maven-lifecycle/pom.xml
@@ -29,7 +29,7 @@ under the License.
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-lifecycle</artifactId>
   <name>Maven Lifecycle Model</name>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -49,7 +49,9 @@ under the License.
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/maven-lifecycle.mdo</model>
+          <models>
+            <model>src/main/mdo/maven-lifecycle.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 4cec5b6ac0..59e2268b91 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -37,7 +37,9 @@ under the License.
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>4.0.0</version>
-          <model>src/main/mdo/maven.mdo</model>
+          <models>
+            <model>src/main/mdo/maven.mdo</model>
+          </models>
         </configuration> 
       </plugin>
     </plugins>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 0a0d61aa48..f109ffcc46 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -46,7 +46,9 @@ under the License.
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
-          <model>src/main/mdo/lifecycle.mdo</model>
+          <models>
+            <model>src/main/mdo/lifecycle.mdo</model>
+          </models>
           <version>1.0.0</version>
         </configuration>
       </plugin>
diff --git a/maven-project/pom.xml b/maven-project/pom.xml
index 4f0cc46550..bb048a9463 100644
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@@ -56,11 +56,11 @@ under the License.
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
       <scope>test</scope>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-asl</artifactId>
-    </dependency> 
+    </dependency>
     <dependency>
       <groupId>org.sonatype.spice</groupId>
       <artifactId>model-builder</artifactId>
@@ -75,15 +75,17 @@ under the License.
      <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-      </plugin>        
+      </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>1.0.0</version>
-          <model>src/main/mdo/profiles.mdo</model>
+          <models>
+            <model>src/main/mdo/profiles.mdo</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>
-  </build>  
+  </build>
 </project>
diff --git a/maven-toolchain/pom.xml b/maven-toolchain/pom.xml
index c15d24922c..a90fa96462 100644
--- a/maven-toolchain/pom.xml
+++ b/maven-toolchain/pom.xml
@@ -50,7 +50,9 @@
         <configuration>
           <version>1.0.0</version>
           <packageWithVersion>false</packageWithVersion>
-          <model>src/main/mdo/toolchains.xml</model>
+          <models>
+            <model>src/main/mdo/toolchains.xml</model>
+          </models>
         </configuration>
       </plugin>
     </plugins>