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:48:47 UTC
svn commit: r766524 - in /maven/components/branches/maven-2.0.x: ./
apache-maven/ apache-maven/src/test/ maven-artifact-manager/
maven-artifact-test/ maven-artifact/ maven-core-it-runner/ maven-core/
maven-error-diagnostics/ maven-integration-tests/ ma...
Author: hboutemy
Date: Sun Apr 19 21:48:46 2009
New Revision: 766524
URL: http://svn.apache.org/viewvc?rev=766524&view=rev
Log:
reformatted poms according to our conventions (merged from 2.1.x branch r766523)
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/pom.xml
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props changed)
maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml
maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml
maven/components/branches/maven-2.0.x/maven-artifact/pom.xml
maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
maven/components/branches/maven-2.0.x/maven-core/pom.xml
maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml
maven/components/branches/maven-2.0.x/maven-integration-tests/ (props changed)
maven/components/branches/maven-2.0.x/maven-model/pom.xml
maven/components/branches/maven-2.0.x/maven-model/src/test/ (props changed)
maven/components/branches/maven-2.0.x/maven-monitor/pom.xml
maven/components/branches/maven-2.0.x/maven-plugin-api/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-project/pom.xml
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/maven-2.0.x/maven-reporting/pom.xml
maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml
maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml
maven/components/branches/maven-2.0.x/maven-script/pom.xml
maven/components/branches/maven-2.0.x/maven-settings/pom.xml
maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 21:48:46 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
/maven/components/branches/maven-2.1.0-RC:753089
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997,763796
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997,763796,766523
/maven/components/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 21:48:46 2009
@@ -1,6 +1,6 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
/maven/components/branches/maven-2.1.0-RC/apache-maven:753089
-/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
+/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Sun Apr 19 21:48:46 2009
@@ -22,12 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
+
<name>Maven Distribution</name>
<build>
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 21:48:46 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:753089
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523
Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Sun Apr 19 21:48:46 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</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-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>
@@ -61,6 +65,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<pluginManagement>
<plugins>
Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Sun Apr 19 21:48:46 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</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-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.0.x/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Sun Apr 19 21:48:46 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</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-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.0.x/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Sun Apr 19 21:48:46 2009
@@ -25,6 +25,7 @@
<version>2.0.11-SNAPSHOT</version>
</parent>
<artifactId>maven-core-it-runner</artifactId>
+
<name>Integration Test Executor</name>
<scm>
@@ -62,6 +63,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -104,6 +106,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>no-local-repo-defined</id>
Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Sun Apr 19 21:48:46 2009
@@ -22,12 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
+
<name>Maven Core</name>
<dependencies>
Modified: maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,17 +20,21 @@
-->
<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.0.11-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>
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 21:48:46 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:753089
-/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
+/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523
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?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-model/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,15 +20,26 @@
-->
<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.0.11-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>
@@ -50,6 +61,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>all-models</id>
@@ -92,10 +104,4 @@
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
</project>
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 21:48:46 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:753089
-/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
+/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523
Modified: maven/components/branches/maven-2.0.x/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-monitor/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-monitor/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,12 +20,15 @@
-->
<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.0.11-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-monitor</artifactId>
+
<name>Maven Monitor</name>
</project>
Modified: maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml Sun Apr 19 21:48:46 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</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-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.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?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- 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 Sun Apr 19 21:48:46 2009
@@ -20,28 +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</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-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>
@@ -56,4 +46,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.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?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- 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 Sun Apr 19 21:48:46 2009
@@ -20,14 +20,29 @@
-->
<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.0.11-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>
@@ -42,14 +57,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.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?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- 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 Sun Apr 19 21:48:46 2009
@@ -18,15 +18,29 @@
-->
<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.0.11-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.0.x/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-profile/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-profile/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,28 +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</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-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>
@@ -56,4 +46,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.0.x/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-project/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,16 +20,20 @@
-->
<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.0.11-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.0.x/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml Sun Apr 19 21:48:46 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.0.11-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.0.x/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,17 +20,21 @@
-->
<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.0.11-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.0.x/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,15 +20,26 @@
-->
<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.0.11-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>
@@ -56,10 +67,4 @@
</plugins>
</pluginManagement>
</build>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
</project>
Modified: maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml Sun Apr 19 21:48:46 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.0.11-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>
Modified: maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml Sun Apr 19 21:48:46 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.0.11-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.0.x/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-script/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,16 +20,19 @@
-->
<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.0.11-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.0.x/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/pom.xml Sun Apr 19 21:48:46 2009
@@ -20,28 +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</artifactId>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
<version>2.0.11-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>
@@ -60,4 +50,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.0.x/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml?rev=766524&r1=766523&r2=766524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml Sun Apr 19 21:48:46 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>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>2.0.11-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-toolchain</artifactId>
+
<name>Maven Toolchains</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -44,6 +48,7 @@
<artifactId>maven-artifact</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>