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 2009/04/19 23:40:33 UTC
svn commit: r766523 - in /maven/components/branches/maven-2.1.x:
apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/
maven-core-it-runner/ maven-core/ maven-error-diagnostics/ maven-model/
maven-monitor/ maven-plugin-api/ maven-p...
Author: hboutemy
Date: Sun Apr 19 21:40:31 2009
New Revision: 766523
URL: http://svn.apache.org/viewvc?rev=766523&view=rev
Log:
reformatted poms according to our conventions
Modified:
maven/components/branches/maven-2.1.x/apache-maven/pom.xml
maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml
maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml
maven/components/branches/maven-2.1.x/maven-artifact/pom.xml
maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml
maven/components/branches/maven-2.1.x/maven-core/pom.xml
maven/components/branches/maven-2.1.x/maven-error-diagnostics/pom.xml
maven/components/branches/maven-2.1.x/maven-model/pom.xml
maven/components/branches/maven-2.1.x/maven-monitor/pom.xml
maven/components/branches/maven-2.1.x/maven-plugin-api/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-project/pom.xml
maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/maven-2.1.x/maven-reporting/pom.xml
maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml
maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml
maven/components/branches/maven-2.1.x/maven-script/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/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/apache-maven/pom.xml Sun Apr 19 21:40:31 2009
@@ -21,12 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
+
<name>Maven Distribution</name>
<build>
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,14 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-artifact-manager</artifactId>
+
<name>Maven Artifact Manager</name>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -74,6 +78,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<pluginManagement>
<plugins>
Modified: maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,14 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-artifact-test</artifactId>
+
<name>Maven Artifact Test Helper Library</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/components/branches/maven-2.1.x/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,14 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-artifact</artifactId>
+
<name>Maven Artifact</name>
+
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml Sun Apr 19 21:40:31 2009
@@ -23,6 +23,7 @@
<groupId>org.apache.maven</groupId>
<version>2.1.1-SNAPSHOT</version>
<artifactId>maven-core-it-runner</artifactId>
+
<name>Integration Test Executor</name>
<scm>
@@ -60,6 +61,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -102,6 +104,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>no-local-repo-defined</id>
Modified: maven/components/branches/maven-2.1.x/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core/pom.xml Sun Apr 19 21:40:31 2009
@@ -21,12 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
+
<name>Maven Core</name>
<dependencies>
Modified: maven/components/branches/maven-2.1.x/maven-error-diagnostics/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-error-diagnostics/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-error-diagnostics/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-error-diagnostics/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,17 +18,21 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-error-diagnostics</artifactId>
+
<name>Maven Error Diagnostics</name>
<description>Provides a manager component which will process a given Throwable instance through a set of diagnostic
sub-components, and return a String message with user-friendly information about the error and possibly
how to fix it.</description>
+
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,15 +18,26 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-model</artifactId>
+
<name>Maven Model</name>
<description>Maven Model</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -48,6 +59,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>all-models</id>
@@ -90,10 +102,4 @@
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
</project>
Modified: maven/components/branches/maven-2.1.x/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-monitor/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-monitor/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,12 +18,15 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-monitor</artifactId>
+
<name>Maven Monitor</name>
</project>
Modified: maven/components/branches/maven-2.1.x/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-plugin-api/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-plugin-api/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,14 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-plugin-api</artifactId>
+
<name>Maven Plugin API</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,28 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-plugin-descriptor</artifactId>
+
<name>Maven Plugin Descriptor Model</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <models>
- <model>src/main/mdo/lifecycle.mdo</model>
- </models>
- <version>1.0.0</version>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -54,4 +44,19 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <configuration>
+ <models>
+ <model>src/main/mdo/lifecycle.mdo</model>
+ </models>
+ <version>1.0.0</version>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,14 +18,29 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-plugin-parameter-documenter</artifactId>
+
<name>Maven Plugin Parameter Documenter API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -40,14 +55,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </dependency>
- </dependencies>
</project>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,15 +18,29 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven</groupId>
+
<artifactId>maven-plugin-registry</artifactId>
+
<name>Maven Plugin Registry Model</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -41,14 +55,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </dependency>
- </dependencies>
</project>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,28 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-profile</artifactId>
+
<name>Maven Profile Model</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <version>1.0.0</version>
- <models>
- <model>src/main/mdo/profiles.mdo</model>
- </models>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -54,4 +44,19 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <configuration>
+ <version>1.0.0</version>
+ <models>
+ <model>src/main/mdo/profiles.mdo</model>
+ </models>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/components/branches/maven-2.1.x/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-project/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,16 +18,20 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-project</artifactId>
+
<name>Maven Project Builder</name>
<description>This library is used to not only read Maven project object model files, but to assemble inheritence
and to retrieve remote models as required.</description>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml Sun Apr 19 21:40:31 2009
@@ -20,14 +20,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven-reporting</artifactId>
<groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-reporting-api</artifactId>
+
<name>Maven Reporting API</name>
+
<developers>
<developer>
<id>vsiveton</id>
@@ -39,6 +43,7 @@
<timezone>-5</timezone>
</developer>
</developers>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
Modified: maven/components/branches/maven-2.1.x/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-reporting/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-reporting/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,17 +18,21 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting</artifactId>
<packaging>pom</packaging>
+
<name>Maven Reporting</name>
<inceptionYear>2005</inceptionYear>
+
<modules>
<module>maven-reporting-api</module>
</modules>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,15 +18,26 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-repository-metadata</artifactId>
+
<name>Maven Repository Metadata Model</name>
<description>Maven Plugin Mapping</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -41,10 +52,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
</project>
Modified: maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml Sun Apr 19 21:40:31 2009
@@ -20,14 +20,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven-script</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-script</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-script-ant</artifactId>
+
<name>Maven Ant Mojo Support</name>
+
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
@@ -53,26 +57,26 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-descriptor</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-descriptor</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-11</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-11</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml Sun Apr 19 21:40:31 2009
@@ -20,14 +20,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven-script</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-script</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-script-beanshell</artifactId>
+
<name>Maven Beanshell Mojo Support</name>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/branches/maven-2.1.x/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-script/pom.xml?rev=766523&r1=766522&r2=766523&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-script/pom.xml Sun Apr 19 21:40:31 2009
@@ -18,16 +18,19 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven</groupId>
+
<artifactId>maven-script</artifactId>
<packaging>pom</packaging>
+
<name>Maven Script Support Root</name>
+
<modules>
<module>maven-script-ant</module>
<module>maven-script-beanshell</module>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,28 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-settings</artifactId>
+
<name>Maven Local Settings Model</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <version>1.0.0</version>
- <models>
- <model>src/main/mdo/settings.mdo</model>
- </models>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -58,4 +48,19 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <configuration>
+ <version>1.0.0</version>
+ <models>
+ <model>src/main/mdo/settings.mdo</model>
+ </models>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=766523&r1=766522&r2=766523&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 Apr 19 21:40:31 2009
@@ -18,14 +18,18 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>2.1.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-toolchain</artifactId>
+
<name>Maven Toolchains</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -42,6 +46,7 @@
<artifactId>maven-artifact</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>