Author: hboutemy
Date: Sun Dec 14 14:07:08 2008
New Revision: 726552
URL: http://svn.apache.org/viewvc?rev=726552&view=rev
Log:
[MNG-3898] use models attribute of modello-maven-plugin instead of model
(merged from 2.0.x branch r726548)
Modified:
maven/components/trunk/maven-compat/pom.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-lifecycle/pom.xml
maven/components/trunk/maven-model/pom.xml
maven/components/trunk/maven-plugin-api/pom.xml
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/maven-toolchain/pom.xml
Modified: maven/components/trunk/maven-compat/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=726552&r1=726551&r2=726552&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/pom.xml (original)
+++ maven/components/trunk/maven-compat/pom.xml Sun Dec 14 14:07:08 2008
@@ -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>
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=726552&r1=726551&r2=726552&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Sun Dec 14 14:07:08 2008
@@ -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>
Modified: maven/components/trunk/maven-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/pom.xml?rev=726552&r1=726551&r2=726552&view=diff
==============================================================================
--- maven/components/trunk/maven-lifecycle/pom.xml (original)
+++ maven/components/trunk/maven-lifecycle/pom.xml Sun Dec 14 14:07:08 2008
@@ -29,7 +29,7 @@
<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 @@
<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>
Modified: maven/components/trunk/maven-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?rev=726552&r1=726551&r2=726552&view=diff
==============================================================================
--- maven/components/trunk/maven-model/pom.xml (original)
+++ maven/components/trunk/maven-model/pom.xml Sun Dec 14 14:07:08 2008
@@ -37,7 +37,9 @@
<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>
Modified: maven/components/trunk/maven-plugin-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/pom.xml?rev=726552&r1=726551&r2=726552&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/pom.xml (original)
+++ maven/components/trunk/maven-plugin-api/pom.xml Sun Dec 14 14:07:08 2008
@@ -46,7 +46,9 @@
<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>
Modified: maven/components/trunk/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=726552&r1=726551&r2=726552&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Sun Dec 14 14:07:08 2008
@@ -56,11 +56,11 @@
<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 @@
<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>
Modified: maven/components/trunk/maven-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/pom.xml?rev=726552&r1=726551&r2=726552&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/pom.xml (original)
+++ maven/components/trunk/maven-toolchain/pom.xml Sun Dec 14 14:07:08 2008
@@ -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>
