diff --git a/scm/project.xml b/scm/project.xml
index d690a25e..59abcc94 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -116,38 +116,35 @@
       <artifactId>plexus-utils</artifactId>
       <version>1.0.1</version>
     </dependency>
-
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-scm</artifactId>
-      <version>1.0-alpha-1-20050705.084636-3</version>
-    </dependency>
-    
-
     <dependency>
       <groupId>classworlds</groupId>
       <artifactId>classworlds</artifactId>
       <version>1.1-alpha-1</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.scm</groupId>
+      <artifactId>maven-scm-manager-plexus</artifactId>
+      <version>1.0-alpha-2</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-api</artifactId>
-      <version>1.0-alpha-2-20050712.151302-2</version>
+      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-cvs</artifactId>
-      <version>1.0-alpha-2-20050712.151302-2</version>
+      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-svn</artifactId>
-      <version>1.0-alpha-2-20050712.155105-2</version>
+      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-starteam</artifactId>
-      <version>1.0-alpha-2-20050712.153836-2</version>
+      <version>1.0-alpha-2</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
index 47e86bcb..c3f3267d 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
@@ -21,8 +21,8 @@ import java.io.File;
 
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.add.AddScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
 
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
@@ -41,8 +41,8 @@ public class ScmAddBean
 
         ScmRepository repository = getScmRepository( scmManager );
 
-        AddScmResult result = scmManager.add( repository, new ScmFileSet( new File( getWorkingDirectory() ),
-                                                                          getIncludes(), getExcludes() ) );
+        AddScmResult result = scmManager.getProviderByRepository( repository )
+            .add( repository, new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(), getExcludes() ) );
         checkResult( result );
     }
 
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
index 5ca063a2..f219ab0f 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
@@ -25,13 +25,13 @@ import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.command.tag.TagScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
 import org.apache.maven.scm.log.DefaultLog;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.plexus.embed.Embedder;
-import org.codehaus.plexus.scm.NoSuchScmProviderException;
-import org.codehaus.plexus.scm.ScmManager;
 import org.codehaus.plexus.util.FileUtils;
 
 /**
@@ -94,8 +94,8 @@ public class ScmBean
         }
         checkoutDirectory.mkdirs();
 
-        CheckOutScmResult result = scmManager.checkOut( repository,
-                                                        new ScmFileSet( checkoutDirectory.getAbsoluteFile() ), tag );
+        CheckOutScmResult result = scmManager.getProviderByRepository( repository )
+            .checkOut( repository, new ScmFileSet( checkoutDirectory.getAbsoluteFile() ), tag );
 
         checkResult( result );
     }
@@ -146,8 +146,8 @@ public class ScmBean
     {
         Embedder embedder = getEmbedder();
         ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
-        scmManager.addListener( new DefaultLog() );
-
+        ScmRepository repository = getScmRepository( scmManager );
+        scmManager.getProviderByRepository( repository ).addListener( new DefaultLog() );
         return scmManager;
     }
 
@@ -175,7 +175,8 @@ public class ScmBean
         checkoutDirectory = new File( workingDirectory );
 
         // TODO: want includes/excludes?
-        UpdateScmResult result = scmManager.update( repository, new ScmFileSet( new File( workingDirectory ) ), tag );
+        UpdateScmResult result = scmManager.getProviderByRepository( repository )
+            .update( repository, new ScmFileSet( new File( workingDirectory ) ), tag );
 
         checkResult( result );
     }
@@ -188,7 +189,8 @@ public class ScmBean
         ScmRepository repository = getScmRepository( scmManager );
 
         // TODO: want includes/excludes?
-        TagScmResult result = scmManager.tag( repository, new ScmFileSet( new File( workingDirectory ) ), tag );
+        TagScmResult result = scmManager.getProviderByRepository( repository )
+            .tag( repository, new ScmFileSet( new File( workingDirectory ) ), tag );
 
         checkResult( result );
     }
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
index 2d1f2a67..fe152a1d 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
@@ -21,8 +21,8 @@ import java.io.File;
 
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.checkin.CheckInScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
 
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
@@ -41,9 +41,9 @@ public class ScmCheckinBean
 
         ScmRepository repository = getScmRepository( scmManager );
 
-        CheckInScmResult result = scmManager.checkIn( repository, new ScmFileSet( new File( getWorkingDirectory() ),
-                                                                                  getIncludes(), getExcludes() ),
-                                                      getTag(), message );
+        CheckInScmResult result = scmManager.getProviderByRepository( repository )
+            .checkIn( repository, new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(), getExcludes() ),
+                      getTag(), message );
         checkResult( result );
     }
 
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
index 5de306be..1e6e7d0f 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
@@ -21,8 +21,8 @@ import java.io.File;
 
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.diff.DiffScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
 import org.codehaus.plexus.util.FileUtils;
 
 /**
@@ -47,7 +47,8 @@ public class ScmDiffBean
         ScmRepository repository = getScmRepository( scmManager );
 
         ScmFileSet fileSet = new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(), getExcludes() );
-        DiffScmResult result = scmManager.diff( repository, fileSet, startRevision, endRevision );
+        DiffScmResult result = scmManager.getProviderByRepository( repository ).diff( repository, fileSet,
+                                                                                      startRevision, endRevision );
         checkResult( result );
 
         FileUtils.fileWrite( patchFile, result.getPatch() );
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
index dee16234..58717b88 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
@@ -24,8 +24,8 @@ import java.util.List;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.status.StatusScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
 
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
@@ -44,7 +44,8 @@ public class ScmStatusBean
 
         ScmRepository repository = getScmRepository( scmManager );
 
-        StatusScmResult result = scmManager.status( repository, new ScmFileSet( new File( getWorkingDirectory() ) ) );
+        StatusScmResult result = scmManager.getProviderByRepository( repository )
+            .status( repository, new ScmFileSet( new File( getWorkingDirectory() ) ) );
 
         checkResult( result );
 
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
index b0789ee2..1f96bfea 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
@@ -21,8 +21,8 @@ import java.io.File;
 
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.update.UpdateScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.scm.ScmManager;
 
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
@@ -41,9 +41,9 @@ public class ScmUpdateBean
 
         ScmRepository repository = getScmRepository( scmManager );
 
-        UpdateScmResult result = scmManager.update( repository, new ScmFileSet( new File( getWorkingDirectory() ),
-                                                                                getIncludes(), getExcludes() ),
-                                                    getTag() );
+        UpdateScmResult result = scmManager.getProviderByRepository( repository )
+            .update( repository, new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(), getExcludes() ),
+                     getTag() );
         checkResult( result );
     }