diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 2cee15d24e..2a5cdd1649 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.0-beta-2</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
diff --git a/maven-model/maven.mdo b/maven-model/maven.mdo
index 563f9f66a0..88398a7f0b 100644
--- a/maven-model/maven.mdo
+++ b/maven-model/maven.mdo
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
 <!--
  |
  | o add specification element to a field, this would be more a technical description of
@@ -742,21 +744,21 @@
         <codeSegment>
           <version>4.0.0</version>
           <code><![CDATA[
-    Map pluginMap;
+    java.util.Map pluginMap;
     
     public void flushPluginMap()
     {
         this.pluginMap = null;
     }
 
-    public Map getPluginsAsMap()
+    public java.util.Map getPluginsAsMap()
     {
         if ( pluginMap == null )
         {
-            pluginMap = new HashMap();
+            pluginMap = new java.util.HashMap();
             if ( plugins != null )
             {
-                for ( Iterator it = plugins.iterator(); it.hasNext(); )
+                for ( java.util.Iterator it = plugins.iterator(); it.hasNext(); )
                 {
                     Plugin plugin = (Plugin) it.next();
                     pluginMap.put( plugin.getKey(), plugin );
@@ -1334,12 +1336,12 @@
                     return getJar();
                 }
 
-				String artifact;
+                String artifact;
 
                 if ("ejb-client".equals(getType())) {
-                	artifact = getArtifactId() + "-" + getVersion() + "-client." + getExtension();
+                  artifact = getArtifactId() + "-" + getVersion() + "-client." + getExtension();
                 } else {
-                	artifact = getArtifactId() + "-" + getVersion() + "." + getExtension();
+                  artifact = getArtifactId() + "-" + getVersion() + "." + getExtension();
                 }
 
                 return artifact;
@@ -1759,6 +1761,28 @@
           <defaultValue>../pom.xml</defaultValue>
         </field>
       </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>4.0.0</version>
+          <code><![CDATA[
+            public String getId()
+            {
+                StringBuffer id = new StringBuffer();
+
+                id.append( getGroupId() );
+                id.append( ":" );
+                id.append( getArtifactId() );
+                id.append( ":" );
+              //  id.append( getPackaging() );
+                id.append( ":" );
+                id.append( getVersion() );
+
+                return id.toString();
+            }
+          ]]></code>
+        </codeSegment>
+      </codeSegments>
+
     </class>
     <class>
       <name>Repository</name>
@@ -2343,21 +2367,21 @@
         <codeSegment>
           <version>4.0.0</version>
           <code><![CDATA[
-    private Map executionMap = null;
+    private java.util.Map executionMap = null;
     
     public void flushExecutionMap()
     {
         this.executionMap = null;
     }
 
-    public Map getExecutionsAsMap()
+    public java.util.Map getExecutionsAsMap()
     {
         if ( executionMap == null )
         {
-            executionMap = new HashMap();
+            executionMap = new java.util.HashMap();
             if ( getExecutions() != null )
             {
-                for ( Iterator i = getExecutions().iterator(); i.hasNext(); )
+                for ( java.util.Iterator i = getExecutions().iterator(); i.hasNext(); )
                 {
                     PluginExecution exec = (PluginExecution) i.next();
                     
@@ -2385,7 +2409,7 @@
     }
 
     /** @deprecated */
-    private Map goalMap = null;
+    private java.util.Map goalMap = null;
     /** @deprecated */
     public void flushGoalMap()
     {
@@ -2393,14 +2417,14 @@
     }
 
     /** @deprecated */
-    public Map getGoalsAsMap()
+    public java.util.Map getGoalsAsMap()
     {
         if ( goalMap == null )
         {
-            goalMap = new HashMap();
+            goalMap = new java.util.HashMap();
             if ( goals != null )
             {
-                for ( Iterator i = goals.iterator(); i.hasNext(); )
+                for ( java.util.Iterator i = goals.iterator(); i.hasNext(); )
                 {
                     Goal g = (Goal) i.next();
                     goalMap.put( g.getId(), g );
@@ -2512,21 +2536,21 @@
         <codeSegment>
           <version>4.0.0</version>
           <code><![CDATA[
-    Map reportPluginMap;
+    java.util.Map reportPluginMap;
     
     public void flushReportPluginMap()
     {
         this.reportPluginMap = null;
     }
 
-    public Map getReportPluginsAsMap()
+    public java.util.Map getReportPluginsAsMap()
     {
         if ( reportPluginMap == null )
         {
-            reportPluginMap = new HashMap();
+            reportPluginMap = new java.util.HashMap();
             if ( getPlugins() != null )
             {
-                for ( Iterator it = getPlugins().iterator(); it.hasNext(); )
+                for ( java.util.Iterator it = getPlugins().iterator(); it.hasNext(); )
                 {
                     ReportPlugin reportPlugin = (ReportPlugin) it.next();
                     reportPluginMap.put( reportPlugin.getKey(), reportPlugin );
@@ -2742,21 +2766,21 @@
         <codeSegment>
           <version>4.0.0</version>
           <code><![CDATA[
-    private Map reportSetMap = null;
+    private java.util.Map reportSetMap = null;
     
     public void flushReportSetMap()
     {
         this.reportSetMap = null;
     }
 
-    public Map getReportSetsAsMap()
+    public java.util.Map getReportSetsAsMap()
     {
         if ( reportSetMap == null )
         {
-            reportSetMap = new HashMap();
+            reportSetMap = new java.util.HashMap();
             if ( getReportSets() != null )
             {
-                for ( Iterator i = getReportSets().iterator(); i.hasNext(); )
+                for ( java.util.Iterator i = getReportSets().iterator(); i.hasNext(); )
                 {
                     ReportSet reportSet = (ReportSet) i.next();
                     reportSetMap.put( reportSet.getId(), reportSet );
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 4b6df2df70..9b2c96856b 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -22,7 +22,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-4-SNAPSHOT</version>
         <configuration>
           <version>4.0.0</version>
           <model>maven.mdo</model>
diff --git a/maven-plugin-descriptor/pom.xml b/maven-plugin-descriptor/pom.xml
index 976af6a652..3ed3778f77 100755
--- a/maven-plugin-descriptor/pom.xml
+++ b/maven-plugin-descriptor/pom.xml
@@ -31,7 +31,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
         <configuration>
           <model>src/main/mdo/lifecycle.mdo</model>
           <version>1.0.0</version>
diff --git a/maven-plugin-registry/plugin-registry.mdo b/maven-plugin-registry/plugin-registry.mdo
index 5babb80d9a..730e67bc94 100644
--- a/maven-plugin-registry/plugin-registry.mdo
+++ b/maven-plugin-registry/plugin-registry.mdo
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
 <model>
   <id>plugin-registry</id>
   <name>PluginRegistry</name>
@@ -97,15 +99,15 @@
         <codeSegment>
           <version>1.0.0</version>
           <code><![CDATA[
-    private Map pluginsByKey;
+    private java.util.Map pluginsByKey;
     
-    public Map getPluginsByKey()
+    public java.util.Map getPluginsByKey()
     {
         if ( pluginsByKey == null )
         {
-            pluginsByKey = new HashMap();
+            pluginsByKey = new java.util.HashMap();
             
-            for ( Iterator it = getPlugins().iterator(); it.hasNext(); )
+            for ( java.util.Iterator it = getPlugins().iterator(); it.hasNext(); )
             {
                 Plugin plugin = (Plugin) it.next();
             
@@ -191,4 +193,4 @@
       </codeSegments>
     </class>
   </classes>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugin-registry/pom.xml b/maven-plugin-registry/pom.xml
index f1086e4aac..ea4f6bee04 100644
--- a/maven-plugin-registry/pom.xml
+++ b/maven-plugin-registry/pom.xml
@@ -25,22 +25,20 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <goals>
-          <goal>
-            <id>xpp3-writer</id>
-          </goal>
-          <goal>
-            <id>java</id>
-          </goal>
-          <goal>
-            <id>xpp3-reader</id>
-          </goal>
-        </goals>
-        <configuration>
-          <version>1.0.0</version>
-          <model>plugin-registry.mdo</model>
-        </configuration>
+        <version>1.0-alpha-5-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xpp3-writer</goal>
+              <goal>java</goal>
+              <goal>xpp3-reader</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>plugin-registry.mdo</model>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/maven-plugin-tools/maven-plugin-tools-api/pom.xml b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
index d35374445d..24695b9767 100644
--- a/maven-plugin-tools/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
@@ -19,11 +19,6 @@
       <artifactId>maven-project</artifactId>
       <version>2.0-beta-1-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-core</artifactId>
-      <version>1.0-alpha-1</version>
-    </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
diff --git a/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java b/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
index 658e7e3593..b940dbad9d 100644
--- a/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
+++ b/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
@@ -29,7 +29,7 @@
 import org.apache.maven.plugin.descriptor.Requirement;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
-import org.codehaus.modello.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.io.File;
diff --git a/maven-plugins/maven-assembly-plugin/pom.xml b/maven-plugins/maven-assembly-plugin/pom.xml
index 55b372cffa..bef4eef2b4 100755
--- a/maven-plugins/maven-assembly-plugin/pom.xml
+++ b/maven-plugins/maven-assembly-plugin/pom.xml
@@ -63,22 +63,19 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
         <configuration>
           <model>src/main/mdo/descriptor.mdo</model>
           <version>1.0.0</version>
         </configuration>
-        <goals>
-          <goal>
-            <id>xpp3-reader</id>
-          </goal>
-          <goal>
-            <id>xpp3-writer</id>
-          </goal>
-          <goal>
-            <id>java</id>
-          </goal>
-        </goals>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/maven-plugins/maven-verifier-plugin/pom.xml b/maven-plugins/maven-verifier-plugin/pom.xml
index 2163a9264a..7c402c3414 100644
--- a/maven-plugins/maven-verifier-plugin/pom.xml
+++ b/maven-plugins/maven-verifier-plugin/pom.xml
@@ -39,7 +39,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
         <configuration>
           <model>src/main/mdo/verifications.mdo</model>
           <version>1.0.0</version>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 610d0ed0c7..81ebbf98c2 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -144,6 +144,11 @@
         <artifactId>plexus-utils</artifactId>
         <version>1.0.2-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-5-SNAPSHOT</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <modules>
diff --git a/maven-profile/pom.xml b/maven-profile/pom.xml
index d04a0f01bd..3e9b153d1c 100644
--- a/maven-profile/pom.xml
+++ b/maven-profile/pom.xml
@@ -33,22 +33,19 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <goals>
-          <goal>
-            <id>xpp3-writer</id>
-          </goal>
-          <goal>
-            <id>java</id>
-          </goal>
-          <goal>
-            <id>xpp3-reader</id>
-          </goal>
-        </goals>
-        <configuration>
-          <version>1.0.0</version>
-          <model>profiles.mdo</model>
-        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xpp3-writer</goal>
+              <goal>java</goal>
+              <goal>xpp3-reader</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>profiles.mdo</model>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index a49d26a8c3..06def0939e 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -22,7 +22,6 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
         <configuration>
           <version>1.0.0</version>
           <model>src/main/mdo/metadata.mdo</model>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 939eed56da..33eeee0337 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -28,22 +28,19 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <goals>
-          <goal>
-            <id>xpp3-writer</id>
-          </goal>
-          <goal>
-            <id>java</id>
-          </goal>
-          <goal>
-            <id>xpp3-reader</id>
-          </goal>
-        </goals>
-        <configuration>
-          <version>1.0.0</version>
-          <model>settings.mdo</model>
-        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xpp3-writer</goal>
+              <goal>java</goal>
+              <goal>xpp3-reader</goal>
+            </goals>
+            <configuration>
+              <version>1.0.0</version>
+              <model>settings.mdo</model>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/maven-settings/settings.mdo b/maven-settings/settings.mdo
index 8c49817c6b..5bd623bf87 100644
--- a/maven-settings/settings.mdo
+++ b/maven-settings/settings.mdo
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
 <model>
   <id>settings</id>
   <name>Settings</name>
@@ -212,12 +214,12 @@
     {
         if(activeProxy == null)
         {
-            List proxies = getProxies();
+            java.util.List proxies = getProxies();
             if ( proxies != null && !proxies.isEmpty() )
             {
                 if ( proxies.size() > 1 )
                 {
-                    for ( Iterator it = proxies.iterator(); it.hasNext(); )
+                    for ( java.util.Iterator it = proxies.iterator(); it.hasNext(); )
                     {
                         Proxy proxy = (Proxy) it.next();
                         if ( proxy.isActive() )
@@ -242,10 +244,10 @@
     {
         Server match = null;
 
-        List servers = getServers();
+        java.util.List servers = getServers();
         if ( servers != null && serverId != null )
         {
-            for ( Iterator it = servers.iterator(); it.hasNext(); )
+            for ( java.util.Iterator it = servers.iterator(); it.hasNext(); )
             {
                 Server server = (Server) it.next();
                 if ( serverId.equals( server.getId() ) )
@@ -263,10 +265,10 @@
     {
         Mirror match = null;
 
-        List mirrors = getMirrors();
+        java.util.List mirrors = getMirrors();
         if ( mirrors != null && repositoryId != null )
         {
-            for ( Iterator it = mirrors.iterator(); it.hasNext(); )
+            for ( java.util.Iterator it = mirrors.iterator(); it.hasNext(); )
             {
                 Mirror mirror = (Mirror) it.next();
                 if ( repositoryId.equals( mirror.getMirrorOf() ) )
@@ -280,22 +282,22 @@
         return match;
     }
     
-    private Map profileMap;
+    private java.util.Map profileMap;
     
     public void flushProfileMap()
     {
         this.profileMap = null;
     }
     
-    public Map getProfilesAsMap()
+    public java.util.Map getProfilesAsMap()
     {
         if ( profileMap == null )
         {
-            profileMap = new HashMap();
+            profileMap = new java.util.HashMap();
             
             if ( getProfiles() != null )
             {
-                for ( Iterator it = getProfiles().iterator(); it.hasNext(); )
+                for ( java.util.Iterator it = getProfiles().iterator(); it.hasNext(); )
                 {
                     Profile profile = (Profile) it.next();
                     
@@ -764,4 +766,4 @@
     </class>
     <!-- /BuildProfile support -->
   </classes>
-</model>
\ No newline at end of file
+</model>
diff --git a/pom.xml b/pom.xml
index 21814ad6f9..5fc3625af5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,6 +172,11 @@
         <artifactId>plexus-utils</artifactId>
         <version>1.0.2-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-5-SNAPSHOT</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <modules>