From d1c1f303134165004e4654e3d4023c9487f6557d Mon Sep 17 00:00:00 2001
From: Britton Isbell <sisbell@apache.org>
Date: Mon, 20 Apr 2009 14:10:18 +0000
Subject: [PATCH] Reverting out pom changes. The poms look fine but ant build
 file is barfing on the comment syntax and mercury bootstrap is not picking up
 doxia into its classpath. I've branched this to look into the issue.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766701 13f79535-47bb-0310-9956-ffa450edef68
---
 apache-maven/pom.xml             |  10 +-
 maven-compat/pom.xml             |   9 +-
 maven-core/pom.xml               |  36 ++--
 maven-embedder/pom.xml           |  13 +-
 maven-lifecycle/pom.xml          |   7 +-
 maven-mercury/pom.xml            |  23 +--
 maven-model-builder/pom.xml      |  20 +-
 maven-model/pom.xml              |  22 +--
 maven-plugin-api/pom.xml         |   9 +-
 maven-project/pom.xml            |  16 +-
 maven-reporting-api/pom.xml      |   9 +-
 maven-repository-mercury/pom.xml |  37 ++--
 maven-repository/pom.xml         |  20 +-
 maven-toolchain/pom.xml          |   9 +-
 pom.xml                          | 305 +++++++++++++++----------------
 15 files changed, 232 insertions(+), 313 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 77b2f8d775..59b6dbdd85 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -14,20 +13,15 @@
     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>
+    <groupId>org.apache.maven</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-
   <artifactId>apache-maven</artifactId>
-
   <name>Maven Distribution</name>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -88,7 +82,6 @@
       <version>${mercuryVersion}</version>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -104,7 +97,6 @@
       </plugin>
     </plugins>
   </build>
-
   <profiles>
      <profile>
       <id>standard</id>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index ba025334b1..6f1ba8a823 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -9,20 +8,15 @@
     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>
@@ -52,7 +46,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 18f8d07be1..edc7d6a766 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -11,18 +11,14 @@
   -->
 
 <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>
+    <groupId>org.apache.maven</groupId>
     <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>
@@ -114,24 +110,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>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.mercury</groupId>
-      <artifactId>mercury-transport-http</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>   
+        
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 0c3078db7a..5cb452aed2 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -9,20 +8,15 @@
     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>
+    <groupId>org.apache.maven</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-
   <artifactId>maven-embedder</artifactId>
-
   <name>Maven Embedder</name>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -70,11 +64,10 @@
       <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>
diff --git a/maven-lifecycle/pom.xml b/maven-lifecycle/pom.xml
index 70a5137e23..9daedd7bb3 100644
--- a/maven-lifecycle/pom.xml
+++ b/maven-lifecycle/pom.xml
@@ -20,16 +20,13 @@ 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>
+    <groupId>org.apache.maven</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-
+  <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-lifecycle</artifactId>
-
   <name>Maven Lifecycle Model</name>
 
   <dependencies>
diff --git a/maven-mercury/pom.xml b/maven-mercury/pom.xml
index 8808597ffd..aafcc4e140 100644
--- a/maven-mercury/pom.xml
+++ b/maven-mercury/pom.xml
@@ -11,16 +11,13 @@
   -->
 
 <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>
+    <groupId>org.apache.maven</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-
+  <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-mercury</artifactId>
-
   <name>Maven Mercury</name>
 
   <dependencies>
@@ -103,14 +100,14 @@
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate-metadata</goal>
-                <goal>generate-test-metadata</goal>
-              </goals>
-            </execution>
-          </executions>
+          <executions>                                                                                                          
+            <execution>                                                                                                         
+              <goals>                                                                                                           
+                <goal>generate-metadata</goal>                                                                                  
+                <goal>generate-test-metadata</goal>                                                                             
+              </goals>                                                                                                          
+            </execution>                                                                                                        
+          </executions>                                                                                                         
       </plugin>
     </plugins>
   </build>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 019a1718bc..6b7ea47540 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -11,19 +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>
-    <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
+    <groupId>org.apache.maven</groupId>
     <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>
@@ -32,11 +29,11 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-annotations</artifactId>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-asl</artifactId>
@@ -44,7 +41,7 @@
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax-api</artifactId>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -52,14 +49,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-      </plugin>
-    </plugins>
+     </plugin>
+  </plugins>
   </build>
 
 </project>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 6c75b00ac7..b0c223c6c0 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -20,26 +20,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>
-    <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
+    <groupId>org.apache.maven</groupId>
     <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>
@@ -69,7 +58,6 @@ under the License.
       </plugin>
     </plugins>
   </reporting>
-
   <profiles>
     <profile>
       <id>all-models</id>
@@ -112,4 +100,10 @@ under the License.
       </build>
     </profile>
   </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index f54c68cea3..f649c4f109 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -20,18 +20,14 @@ 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>
+    <groupId>org.apache.maven</groupId>
     <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>
@@ -43,7 +39,6 @@ under the License.
       <artifactId>plexus-container-default</artifactId>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/maven-project/pom.xml b/maven-project/pom.xml
index 3fc8687cbb..b2ca6696e4 100644
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@@ -20,21 +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>
-    <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
+    <groupId>org.apache.maven</groupId>
     <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>
@@ -74,11 +69,10 @@ under the License.
         <artifactId>maven-repository</artifactId>
       </dependency>
     <dependency>
-      <groupId>commons-jxpath</groupId>
-      <artifactId>commons-jxpath</artifactId>
-    </dependency>
+    	<groupId>commons-jxpath</groupId>
+    	<artifactId>commons-jxpath</artifactId>
+    </dependency>     
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/maven-reporting-api/pom.xml b/maven-reporting-api/pom.xml
index 5754d29a90..c672717306 100644
--- a/maven-reporting-api/pom.xml
+++ b/maven-reporting-api/pom.xml
@@ -20,18 +20,14 @@ 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>
+    <groupId>org.apache.maven</groupId>
     <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>
@@ -43,7 +39,6 @@ under the License.
       <timezone>-5</timezone>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
diff --git a/maven-repository-mercury/pom.xml b/maven-repository-mercury/pom.xml
index 7648e27917..2aa9a6aa1c 100644
--- a/maven-repository-mercury/pom.xml
+++ b/maven-repository-mercury/pom.xml
@@ -20,16 +20,13 @@ 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>
+    <groupId>org.apache.maven</groupId>
     <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>
 
@@ -44,7 +41,7 @@ under the License.
       <artifactId>maven-repository</artifactId>
       <version>${project.version}</version>
     </dependency>
-<!--
+<!-- 
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-repository-legacy</artifactId>
@@ -135,7 +132,7 @@ under the License.
       <version>${mercury.version}</version>
       <scope>compile</scope>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-repository</artifactId>
@@ -143,24 +140,24 @@ under the License.
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.sonatype.plexus</groupId>
-      <artifactId>plexus-jetty6</artifactId>
+      <groupId>org.sonatype.plexus</groupId>                                                                                
+      <artifactId>plexus-jetty6</artifactId>                                                                                
       <scope>test</scope>
     </dependency>
-
+    
     <dependency>
       <groupId>org.sonatype.spice</groupId>
       <artifactId>plexus-webdav</artifactId>
       <scope>test</scope>
     </dependency>
-
+  
   </dependencies>
 
   <build>
@@ -168,14 +165,14 @@ under the License.
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate-metadata</goal>
-                <goal>generate-test-metadata</goal>
-              </goals>
-            </execution>
-          </executions>
+          <executions>                                                                                                          
+            <execution>                                                                                                         
+              <goals>                                                                                                           
+                <goal>generate-metadata</goal>                                                                                  
+                <goal>generate-test-metadata</goal>                                                                             
+              </goals>                                                                                                          
+            </execution>                                                                                                        
+          </executions>                                                                                                         
       </plugin>
     </plugins>
   </build>
diff --git a/maven-repository/pom.xml b/maven-repository/pom.xml
index 999049338f..b42db08120 100644
--- a/maven-repository/pom.xml
+++ b/maven-repository/pom.xml
@@ -20,45 +20,41 @@ 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>
+    <groupId>org.apache.maven</groupId>
     <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>
       <artifactId>maven-model</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
       <scope>test</scope>
-    </dependency>
+    </dependency>        
   </dependencies>
 
   <build>
@@ -88,7 +84,7 @@ under the License.
           </execution>
         </executions>
       </plugin>
-
+      
     </plugins>
   </build>
 </project>
diff --git a/maven-toolchain/pom.xml b/maven-toolchain/pom.xml
index 032f1c3465..f651b78cd3 100644
--- a/maven-toolchain/pom.xml
+++ b/maven-toolchain/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -14,20 +13,15 @@
     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>
@@ -38,7 +32,6 @@
       <artifactId>maven-compat</artifactId>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/pom.xml b/pom.xml
index c3364e3399..9d34dfa183 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,18 +21,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>
     <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:
@@ -44,7 +42,39 @@ 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>
@@ -120,7 +150,91 @@ 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>
@@ -136,54 +250,17 @@ under the License.
     <module>maven-compat</module>
     <module>maven-repository</module>
   </modules>
-
-  <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>
-
+  <!--start-->
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junitVersion}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   <dependencyManagement>
+    <!--end-->
     <dependencies>
       <!--  Maven Modules -->
       <!--start-->
@@ -348,11 +425,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>
@@ -360,20 +437,20 @@ under the License.
         <version>${commonsCliVersion}</version>
         <exclusions>
           <exclusion>
-            <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
+            <groupId>commons-lang</groupId>
           </exclusion>
           <exclusion>
-            <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <groupId>commons-logging</groupId>
           </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>
@@ -396,9 +473,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>
@@ -463,98 +540,12 @@ under the License.
     <!--start-->
   </dependencyManagement>
   <!--end-->
-  <!--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>
-
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</url>
+    </site>
+  </distributionManagement>
   <profiles>
     <profile>
       <id>osgi</id>