Author: jvanzyl
Date: Wed Feb 28 05:50:56 2007
New Revision: 512755
URL: http://svn.apache.org/viewvc?view=rev&rev=512755
Log:
MNG-2776 Configure the use of modello in the parent POM and use the latest
released version of the modello plugin
Modified:
maven/components/branches/maven-2.0.x/maven-model/pom.xml
maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml
maven/components/branches/maven-2.0.x/maven-profile/pom.xml
maven/components/branches/maven-2.0.x/maven-settings/pom.xml
maven/components/branches/maven-2.0.x/pom.xml
Modified: maven/components/branches/maven-2.0.x/maven-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/pom.xml?view=diff&rev=512755&r1=512754&r2=512755
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-model/pom.xml Wed Feb 28
05:50:56 2007
@@ -34,25 +34,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-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<version>4.0.0</version>
<model>src/main/mdo/maven.mdo</model>
Modified: maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml?view=diff&rev=512755&r1=512754&r2=512755
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml Wed
Feb 28 05:50:56 2007
@@ -33,24 +33,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-7</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>
<configuration>
<model>src/main/mdo/lifecycle.mdo</model>
<version>1.0.0</version>
Modified:
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml?view=diff&rev=512755&r1=512754&r2=512755
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
Wed Feb 28 05:50:56 2007
@@ -33,36 +33,9 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-7</version>
- <executions>
- <execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- <execution>
- <id>base</id>
- <goals>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- </goals>
- </execution>
- <execution>
- <id>xsd</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>xsd</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<version>1.0.0</version>
<model>src/main/mdo/paramdoc.mdo</model>
- <packageWithVersion>false</packageWithVersion>
</configuration>
</plugin>
</plugins>
Modified: maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml?view=diff&rev=512755&r1=512754&r2=512755
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml Wed Feb
28 05:50:56 2007
@@ -33,24 +33,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-7</version>
- <executions>
- <execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <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>plugin-registry.mdo</model>
Modified: maven/components/branches/maven-2.0.x/maven-profile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-profile/pom.xml?view=diff&rev=512755&r1=512754&r2=512755
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-profile/pom.xml Wed Feb 28
05:50:56 2007
@@ -33,24 +33,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-7</version>
- <executions>
- <execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <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>profiles.mdo</model>
Modified: maven/components/branches/maven-2.0.x/maven-settings/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/pom.xml?view=diff&rev=512755&r1=512754&r2=512755
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/pom.xml Wed Feb 28
05:50:56 2007
@@ -33,24 +33,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-7</version>
- <executions>
- <execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <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>src/main/mdo/settings.mdo</model>
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?view=diff&rev=512755&r1=512754&r2=512755
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Wed Feb 28 05:50:56 2007
@@ -63,6 +63,29 @@
<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-13</version>
+ <executions>
+ <execution>
+ <id>site-docs</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xdoc</goal>
+ <goal>xsd</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>standard</id>
+ <goals>
+ <goal>java</goal>
+ <goal>xpp3-reader</goal>
+ <goal>xpp3-writer</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
