reformatted poms according to our conventions (merged from 2.1.x branch r766523)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766535 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 22:25:38 +00:00 · 2009-04-19 22:25:38 +00:00 · 8a119ce695
parent 8d1be44456
commit 8a119ce695
15 changed files with 313 additions and 232 deletions
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
  <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements. See the NOTICE file distributed with
@ -13,15 +14,20 @@
    License for the specific language governing permissions and
    limitations 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>3.0-SNAPSHOT</version>
  </parent>
+
  <artifactId>apache-maven</artifactId>
+
  <name>Maven Distribution</name>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven</groupId>
@ -82,6 +88,7 @@
      <version>${mercuryVersion}</version>
    </dependency>
  </dependencies>
+
  <build>
    <plugins>
      <plugin>
@ -97,6 +104,7 @@
      </plugin>
    </plugins>
  </build>
+
  <profiles>
     <profile>
      <id>standard</id>
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
  <!--
    Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
    file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
@ -8,15 +9,20 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
    governing permissions and limitations 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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-compat</artifactId>
+
  <name>Maven Compat</name>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven</groupId>
@ -46,6 +52,7 @@
      <scope>test</scope>
    </dependency>
  </dependencies>
+
  <build>
    <plugins>
      <plugin>
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@ -11,14 +11,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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-core</artifactId>
+
  <name>Maven Core</name>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven</groupId>
@ -110,24 +114,24 @@
      <artifactId>plexus-sec-dispatcher</artifactId>
    </dependency>
    <dependency>
-    	<groupId>commons-jxpath</groupId>
-    	<artifactId>commons-jxpath</artifactId>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
    </dependency>

    <dependency>
-    	<groupId>org.apache.maven.mercury</groupId>
-    	<artifactId>mercury-repo-remote-m2</artifactId>
-    	<version>${mercuryVersion}</version>
-    	<scope>test</scope>
+      <groupId>org.apache.maven.mercury</groupId>
+      <artifactId>mercury-repo-remote-m2</artifactId>
+      <version>${mercuryVersion}</version>
+      <scope>test</scope>
    </dependency>
-     <dependency>
-    	<groupId>org.apache.maven.mercury</groupId>
-    	<artifactId>mercury-transport-http</artifactId>
-    	<version>${mercuryVersion}</version>
-    	<scope>test</scope>
+    <dependency>
+      <groupId>org.apache.maven.mercury</groupId>
+      <artifactId>mercury-transport-http</artifactId>
+      <version>${mercuryVersion}</version>
+      <scope>test</scope>
    </dependency>
-        
  </dependencies>
+
  <build>
    <plugins>
      <plugin>
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
  <!--
    Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
    file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
@ -8,15 +9,20 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
    governing permissions and limitations 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>3.0-SNAPSHOT</version>
  </parent>
+
  <artifactId>maven-embedder</artifactId>
+
  <name>Maven Embedder</name>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven</groupId>
@ -64,10 +70,11 @@
      <artifactId>easymock</artifactId>
    </dependency>
    <dependency>
-    	<groupId>commons-jxpath</groupId>
-    	<artifactId>commons-jxpath</artifactId>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
    </dependency>
  </dependencies>
+
  <build>
    <resources>
      <resource>
--- a/maven-lifecycle/pom.xml
+++ b/maven-lifecycle/pom.xml
@ -20,13 +20,16 @@ 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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-lifecycle</artifactId>
+
  <name>Maven Lifecycle Model</name>

  <dependencies>
--- a/maven-mercury/pom.xml
+++ b/maven-mercury/pom.xml
@ -11,13 +11,16 @@
  -->

 <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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-mercury</artifactId>
+
  <name>Maven Mercury</name>

  <dependencies>
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@ -11,16 +11,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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
+
  <artifactId>maven-model-builder</artifactId>
  <version>3.0-SNAPSHOT</version>
+
  <name>Maven Model Builder</name>
+
  <dependencies>
    <dependency>
      <groupId>org.codehaus.plexus</groupId>
@ -49,13 +52,14 @@
      <scope>test</scope>
    </dependency>
  </dependencies>
+
  <build>
    <plugins>
      <plugin>
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-component-metadata</artifactId>
-     </plugin>
-  </plugins>
+      </plugin>
+    </plugins>
  </build>

 </project>
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@ -20,15 +20,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>3.0-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>
@ -58,6 +69,7 @@ under the License.
      </plugin>
    </plugins>
  </reporting>
+
  <profiles>
    <profile>
      <id>all-models</id>
@ -100,10 +112,4 @@ under the License.
      </build>
    </profile>
  </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
 </project>
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@ -20,14 +20,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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-plugin-api</artifactId>
+
  <name>Maven Plugin API</name>
+
  <dependencies>
    <!--  Maven Artifact live in the compat module now. -->
    <dependency>
@ -39,6 +43,7 @@ under the License.
      <artifactId>plexus-container-default</artifactId>
    </dependency>
  </dependencies>
+
  <build>
    <plugins>
      <plugin>
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@ -20,16 +20,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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-project</artifactId>
+
  <name>Maven Project</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>
@ -69,10 +74,11 @@ under the License.
        <artifactId>maven-repository</artifactId>
      </dependency>
    <dependency>
-    	<groupId>commons-jxpath</groupId>
-    	<artifactId>commons-jxpath</artifactId>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
    </dependency>
  </dependencies>
+
  <build>
    <plugins>
      <plugin>
--- a/maven-reporting-api/pom.xml
+++ b/maven-reporting-api/pom.xml
@ -20,14 +20,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>3.0-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 @@ under the License.
      <timezone>-5</timezone>
    </developer>
  </developers>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven.doxia</groupId>
--- a/maven-repository-mercury/pom.xml
+++ b/maven-repository-mercury/pom.xml
@ -20,13 +20,16 @@ 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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-repository-mercury</artifactId>
+
  <name>Mercury Repository implementation</name>
  <description>Mercury implementation for the Maven Repository System</description>

--- a/maven-repository/pom.xml
+++ b/maven-repository/pom.xml
@ -20,15 +20,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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-repository</artifactId>
+
  <name>Maven Repository</name>
  <description>Repository System interface for Maven.</description>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven</groupId>
--- a/maven-toolchain/pom.xml
+++ b/maven-toolchain/pom.xml
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
  <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements. See the NOTICE file distributed with
@ -13,15 +14,20 @@
    License for the specific language governing permissions and
    limitations 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>3.0-SNAPSHOT</version>
  </parent>
-  <modelVersion>4.0.0</modelVersion>
+
  <artifactId>maven-toolchain</artifactId>
+
  <name>Maven Toolchains</name>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.maven</groupId>
@ -32,6 +38,7 @@
      <artifactId>maven-compat</artifactId>
    </dependency>
  </dependencies>
+
  <build>
    <plugins>
      <plugin>
--- a/pom.xml
+++ b/pom.xml
@ -21,16 +21,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-parent</artifactId>
    <version>11</version>
    <relativePath>../pom/maven/pom.xml</relativePath>
  </parent>
-  <groupId>org.apache.maven</groupId>
+
  <artifactId>maven</artifactId>
  <version>3.0-SNAPSHOT</version>
  <packaging>pom</packaging>
+
  <name>Apache Maven</name>
  <description>Maven is a project development management and
    comprehension tool. Based on the concept of a project object model:
@ -42,39 +44,7 @@ under the License.
  </description>
  <url>http://maven.apache.org/</url>
  <inceptionYear>2001</inceptionYear>
-  <properties>
-    <classWorldsVersion>1.3</classWorldsVersion>
-    <commonsCliVersion>1.0</commonsCliVersion>
-    <!--

-    Do not update this, Doxia will be decoupled completely from 3.x and someone can
-    create a rendering engine for it if they like when the release stabilizes. JVZ
-
-    -->
-    <doxiaVersion>1.0-alpha-9</doxiaVersion>
-    <easyMockVersion>1.2_Java1.3</easyMockVersion>
-    <junitVersion>3.8.1</junitVersion>
-    <plexusVersion>1.0-beta-3.0.6</plexusVersion>
-    <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
-    <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
-    <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
-    <plexusUtilsVersion>1.5.8</plexusUtilsVersion>
-    <plexusJetty6Version>1.6</plexusJetty6Version>
-    <plexusWebdavVersion>1.0</plexusWebdavVersion>
-    <wagonVersion>1.0-beta-5</wagonVersion>
-    <modelBuilderVersion>1.8</modelBuilderVersion>
-    <mercuryVersion>1.0-alpha-7-SNAPSHOT</mercuryVersion>
-    <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
-    <securityDispatcherVersion>1.2</securityDispatcherVersion>
-    <woodstoxVersion>3.2.6</woodstoxVersion>
-    <modelloVersion>1.0.1</modelloVersion>
-    <jxpathVersion>1.3</jxpathVersion>
-    <staxVersion>1.0.1</staxVersion>
-  </properties>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/MNG</url>
-  </issueManagement>
  <mailingLists>
    <mailingList>
      <name>Maven Developer List</name>
@ -150,91 +120,7 @@ under the License.
      </otherArchives>
    </mailingList>
  </mailingLists>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/components/trunk</url>
-  </scm>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-component-metadata</artifactId>
-          <version>${plexusVersion}</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate-metadata</goal>
-                <goal>generate-test-metadata</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <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>${modelloVersion}</version>
-          <configuration>
-            <useJava5>true</useJava5>
-          </configuration>
-          <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>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>1.0.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.4-SNAPSHOT</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+
  <modules>
    <module>maven-core</module>
    <module>apache-maven</module>
@ -250,17 +136,54 @@ under the License.
    <module>maven-compat</module>
    <module>maven-repository</module>
  </modules>
-  <!--start-->
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junitVersion}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/components/trunk</url>
+  </scm>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://jira.codehaus.org/browse/MNG</url>
+  </issueManagement>
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <classWorldsVersion>1.3</classWorldsVersion>
+    <commonsCliVersion>1.0</commonsCliVersion>
+    <!--
+
+    Do not update this, Doxia will be decoupled completely from 3.x and someone can
+    create a rendering engine for it if they like when the release stabilizes. JVZ
+
+    -->
+    <doxiaVersion>1.0-alpha-9</doxiaVersion>
+    <easyMockVersion>1.2_Java1.3</easyMockVersion>
+    <junitVersion>3.8.1</junitVersion>
+    <plexusVersion>1.0-beta-3.0.6</plexusVersion>
+    <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
+    <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
+    <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
+    <plexusUtilsVersion>1.5.8</plexusUtilsVersion>
+    <plexusJetty6Version>1.6</plexusJetty6Version>
+    <plexusWebdavVersion>1.0</plexusWebdavVersion>
+    <wagonVersion>1.0-beta-5</wagonVersion>
+    <modelBuilderVersion>1.8</modelBuilderVersion>
+    <mercuryVersion>1.0-alpha-7-SNAPSHOT</mercuryVersion>
+    <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
+    <securityDispatcherVersion>1.2</securityDispatcherVersion>
+    <woodstoxVersion>3.2.6</woodstoxVersion>
+    <modelloVersion>1.0.1</modelloVersion>
+    <jxpathVersion>1.3</jxpathVersion>
+    <staxVersion>1.0.1</staxVersion>
+  </properties>
+
  <dependencyManagement>
-    <!--end-->
    <dependencies>
      <!--  Maven Modules -->
      <!--start-->
@ -425,11 +348,11 @@ under the License.
        <artifactId>wstx-asl</artifactId>
        <version>${woodstoxVersion}</version>
      </dependency>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <version>${staxVersion}</version>
-    </dependency>        
+      <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <version>${staxVersion}</version>
+      </dependency>
      <!--  Commons -->
      <dependency>
        <groupId>commons-cli</groupId>
@ -437,20 +360,20 @@ under the License.
        <version>${commonsCliVersion}</version>
        <exclusions>
          <exclusion>
-            <artifactId>commons-lang</artifactId>
            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
          </exclusion>
          <exclusion>
-            <artifactId>commons-logging</artifactId>
            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
          </exclusion>
        </exclusions>
      </dependency>
-    <dependency>
-      <groupId>commons-jxpath</groupId>
-      <artifactId>commons-jxpath</artifactId>
+      <dependency>
+        <groupId>commons-jxpath</groupId>
+        <artifactId>commons-jxpath</artifactId>
        <version>${jxpathVersion}</version>
-    </dependency>
+      </dependency>

      <!--  Mercury -->
      <dependency>
@ -473,9 +396,9 @@ under the License.
        <artifactId>mercury-repo-virtual</artifactId>
        <version>${mercuryVersion}</version>
      </dependency>
-    <dependency>
-      <groupId>org.sonatype.mercury</groupId>
-      <artifactId>mercury-mp3-cli</artifactId>
+      <dependency>
+        <groupId>org.sonatype.mercury</groupId>
+        <artifactId>mercury-mp3-cli</artifactId>
        <version>${mercuryMp3Version}</version>
      </dependency>
      <dependency>
@ -540,12 +463,98 @@ under the License.
    <!--start-->
  </dependencyManagement>
  <!--end-->
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</url>
-    </site>
-  </distributionManagement>
+  <!--start-->
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junitVersion}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <!--end-->
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-component-metadata</artifactId>
+          <version>${plexusVersion}</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>generate-metadata</goal>
+                <goal>generate-test-metadata</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.0.2</version>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <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>${modelloVersion}</version>
+          <configuration>
+            <useJava5>true</useJava5>
+          </configuration>
+          <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>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>1.0.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2-beta-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.4-SNAPSHOT</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
  <profiles>
    <profile>
      <id>osgi</id>