You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/12/14 23:02:05 UTC
svn commit: r726551 - in /maven/components/branches/maven-2.1.x:
maven-model/ maven-plugin-descriptor/ maven-plugin-parameter-documenter/
maven-plugin-registry/ maven-profile/ maven-repository-metadata/
maven-settings/ maven-toolchain/
Author: hboutemy
Date: Sun Dec 14 14:02:04 2008
New Revision: 726551
URL: http://svn.apache.org/viewvc?rev=726551&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/branches/maven-2.1.x/maven-model/pom.xml
maven/components/branches/maven-2.1.x/maven-plugin-descriptor/pom.xml
maven/components/branches/maven-2.1.x/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/maven-2.1.x/maven-plugin-registry/pom.xml
maven/components/branches/maven-2.1.x/maven-profile/pom.xml
maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.1.x/maven-settings/pom.xml
maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml
Modified: maven/components/branches/maven-2.1.x/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-model/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-model/pom.xml Sun Dec 14 14:02:04 2008
@@ -33,7 +33,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>
<plugin>
Modified: maven/components/branches/maven-2.1.x/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-plugin-descriptor/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-plugin-descriptor/pom.xml Sun Dec 14 14:02:04 2008
@@ -31,7 +31,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/branches/maven-2.1.x/maven-plugin-parameter-documenter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-plugin-parameter-documenter/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-plugin-parameter-documenter/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-plugin-parameter-documenter/pom.xml Sun Dec 14 14:02:04 2008
@@ -32,7 +32,9 @@
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.0.0</version>
- <model>src/main/mdo/paramdoc.mdo</model>
+ <models>
+ <model>src/main/mdo/paramdoc.mdo</model>
+ </models>
</configuration>
</plugin>
</plugins>
Modified: maven/components/branches/maven-2.1.x/maven-plugin-registry/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-plugin-registry/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-plugin-registry/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-plugin-registry/pom.xml Sun Dec 14 14:02:04 2008
@@ -33,7 +33,9 @@
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.0.0</version>
- <model>plugin-registry.mdo</model>
+ <models>
+ <model>plugin-registry.mdo</model>
+ </models>
</configuration>
</plugin>
</plugins>
Modified: maven/components/branches/maven-2.1.x/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-profile/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-profile/pom.xml Sun Dec 14 14:02:04 2008
@@ -32,7 +32,9 @@
<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>
Modified: maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml Sun Dec 14 14:02:04 2008
@@ -33,7 +33,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>
</plugins>
Modified: maven/components/branches/maven-2.1.x/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-settings/pom.xml Sun Dec 14 14:02:04 2008
@@ -32,7 +32,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>
</plugins>
Modified: maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml?rev=726551&r1=726550&r2=726551&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml Sun Dec 14 14:02:04 2008
@@ -58,7 +58,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>
<plugin>
@@ -66,7 +68,7 @@
<groupId>org.apache.maven.plugins</groupId>
<executions>
<execution>
- <id>shading</id>
+ <id>shading</id>
<phase>package</phase>
<goals>
<goal>shade</goal>