diff --git a/maven-compat/compatibility.cfl b/maven-compat/compatibility.cfl
index 144a9c3741..968a5318af 100644
--- a/maven-compat/compatibility.cfl
+++ b/maven-compat/compatibility.cfl
@@ -39,3 +39,7 @@ h3. Unsupported Compatibility
 * org.apache.maven.artifact.resolver.metadata.*
 * org.apache.maven.artifact.resolver.transform.*
 * org.apache.maven.artifact.resolver.versioning.*
+
+h2. Changes to the CLI
+* Log file support has been added i.e mvn -l log.txt clean install
+* Plugin registry option has not been supported in the core and it lagged around in the CLI
\ No newline at end of file
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index a21ff4ffea..e8e3bbd3b2 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -111,8 +111,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-model</artifactId>
+      <groupId>org.sonatype.spice</groupId>
+      <artifactId>model-builder</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 3d1c11287e..67642cf32e 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -56,11 +56,6 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
     </dependency>
-    <!-- Needed for compat and cache-control aspects. -->
-    <dependency>
-      <groupId>aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-    </dependency>
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
index 2fbd845686..238664e7b5 100644
--- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
+++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
@@ -148,10 +148,9 @@ public class PomTransformer
                 List<ModelProperty> transformedProperties = new ArrayList<ModelProperty>();
                 for ( ModelProperty mp : managementContainer.getProperties() )
                 {
-                    if ( mp.getUri().startsWith( ProjectUri.DependencyManagement.xUri ) )
+                    if ( mp.getUri().startsWith( ProjectUri.Build.PluginManagement.xUri ) )
                     {
-                        transformedProperties.add( new ModelProperty(
-                            mp.getUri().replace( ProjectUri.DependencyManagement.xUri, ProjectUri.xUri ), mp.getResolvedValue() ) );
+                        transformedProperties.add( new ModelProperty( mp.getUri().replace( ProjectUri.Build.PluginManagement.xUri, ProjectUri.Build.xUri ), mp.getResolvedValue() ) );
                     }
                 }
                 
diff --git a/maven-project/pom.xml b/maven-project/pom.xml
index 40260f3635..4f0cc46550 100644
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@@ -52,10 +52,6 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
-    <dependency>
-      <groupId>aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
@@ -66,8 +62,8 @@ under the License.
       <artifactId>wstx-asl</artifactId>
     </dependency> 
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-model</artifactId>
+      <groupId>org.sonatype.spice</groupId>
+      <artifactId>model-builder</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index 6aab005502..1c186e43d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,23 @@ under the License.
   </description>
   <url>http://maven.apache.org/</url>
   <inceptionYear>2001</inceptionYear>
+  <properties>
+    <classWorldsVersion>1.3</classWorldsVersion>
+    <commonsCliVersion>1.0</commonsCliVersion>
+    <doxiaVersion>1.0-alpha-9</doxiaVersion>
+    <easyMockVersion>1.2_Java1.3</easyMockVersion>
+    <junitVersion>3.8.1</junitVersion>
+    <plexusVersion>1.0-beta-3.0.1</plexusVersion>
+    <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
+    <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
+    <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
+    <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
+    <wagonVersion>1.0-beta-4</wagonVersion>
+    <modelBuilderVersion>1.0</modelBuilderVersion>
+    <mercuryVersion>1.0.0-alpha-2</mercuryVersion>
+    <woodstoxVersion>3.2.6</woodstoxVersion>
+    <modelloVersion>1.0-alpha-22</modelloVersion>
+  </properties>  
   <issueManagement>
     <system>jira</system>
     <url>http://jira.codehaus.org/browse/MNG</url>
@@ -155,15 +172,6 @@ under the License.
             <target>1.5</target>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>aspectj-maven-plugin</artifactId>
-          <version>1.0-beta-2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>
@@ -246,23 +254,6 @@ under the License.
     <module>maven-toolchain</module>
     <module>maven-compat</module>
   </modules>
-  <properties>
-    <aspectjVersion>1.5.3</aspectjVersion>
-    <classWorldsVersion>1.3</classWorldsVersion>
-    <commonsCliVersion>1.0</commonsCliVersion>
-    <doxiaVersion>1.0-alpha-9</doxiaVersion>
-    <easyMockVersion>1.2_Java1.3</easyMockVersion>
-    <junitVersion>3.8.1</junitVersion>
-    <plexusVersion>1.0-beta-3.0.1</plexusVersion>
-    <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
-    <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
-    <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
-    <wagonVersion>1.0-beta-4</wagonVersion>
-    <mavenSharedModel>1.0-SNAPSHOT</mavenSharedModel>
-    <mercuryVersion>1.0.0-alpha-2</mercuryVersion>
-    <woodstoxVersion>3.2.6</woodstoxVersion>
-    <modelloVersion>1.0-alpha-22</modelloVersion>
-  </properties>
   <!--start-->
   <dependencies>
     <dependency>
@@ -404,9 +395,9 @@ under the License.
       </dependency>
       <!--  Maven Shared -->
       <dependency>
-        <groupId>org.apache.maven.shared</groupId>
-        <artifactId>maven-shared-model</artifactId>
-        <version>${mavenSharedModel}</version>
+        <groupId>org.sonatype.spice</groupId>
+        <artifactId>model-builder</artifactId>
+        <version>${modelBuilderVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
@@ -440,16 +431,10 @@ under the License.
         <artifactId>mercury-external</artifactId>
         <version>${mercuryVersion}</version>
       </dependency>
-      <!-- Needed for backward compat aspect. -->
-      <dependency>
-        <groupId>aspectj</groupId>
-        <artifactId>aspectjrt</artifactId>
-        <version>${aspectjVersion}</version>
-      </dependency>
       <dependency>
         <groupId>org.sonatype.plexus</groupId>
         <artifactId>plexus-plugin-manager</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>${plexusPluginManagerVersion}</version>
       </dependency>
       <!--start-->
       <dependency>