diff --git a/scm/project.xml b/scm/project.xml
index 2cb6fe8e..d690a25e 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -109,13 +109,21 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-3</version>
+      <version>1.0-alpha-5</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0-alpha-3</version>
+      <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>
@@ -124,22 +132,22 @@
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-api</artifactId>
-      <version>1.0-alpha-2-20050610.043511-1</version>
+      <version>1.0-alpha-2-20050712.151302-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-cvs</artifactId>
-      <version>1.0-alpha-2-20050610.043511-1</version>
+      <version>1.0-alpha-2-20050712.151302-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-svn</artifactId>
-      <version>1.0-alpha-2-20050610.054835-1</version>
+      <version>1.0-alpha-2-20050712.155105-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-starteam</artifactId>
-      <version>1.0-alpha-2-20050610.051724-1</version>
+      <version>1.0-alpha-2-20050712.153836-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 85f42385..1768787a 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
@@ -19,8 +19,8 @@ package org.apache.maven.plugins.scm;
 
 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;
 
 import java.io.File;
 
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 51fda3d3..5dc346be 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
@@ -19,17 +19,18 @@ package org.apache.maven.plugins.scm;
 
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
 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.manager.ScmManager;
-import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.plexus.embed.Embedder;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.scm.ScmManager;
+import org.apache.maven.scm.log.DefaultLog;
+import org.codehaus.plexus.scm.NoSuchScmProviderException;
 
 import java.io.File;
 
@@ -125,7 +126,6 @@ public class ScmBean
         {
             StarteamScmProviderRepository starteamRepo = (StarteamScmProviderRepository) repository.getProviderRepository();
 
-  /* TODO: reinstate when the provider supports it
             if ( username != null && username.length() > 0 )
             {
                 starteamRepo.setUser( username );
@@ -134,7 +134,6 @@ public class ScmBean
             {
                 starteamRepo.setPassword( password );
             }
-      */
         }
         
         return repository;
@@ -145,6 +144,8 @@ public class ScmBean
     {
         Embedder embedder = getEmbedder();
         ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
+        scmManager.addListener( new DefaultLog() );
+        
         return scmManager;
     }
 
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 671df8d1..f0878aff 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
@@ -19,9 +19,8 @@ package org.apache.maven.plugins.scm;
 
 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.embed.Embedder;
+import org.codehaus.plexus.scm.ScmManager;
 
 import java.io.File;
 
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 c108335d..44cb954b 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
@@ -19,10 +19,10 @@ package org.apache.maven.plugins.scm;
 
 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.embed.Embedder;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.scm.ScmManager;
 
 import java.io.File;
 
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 cc04638f..9016d7c5 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
@@ -20,9 +20,8 @@ package org.apache.maven.plugins.scm;
 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.embed.Embedder;
+import org.codehaus.plexus.scm.ScmManager;
 
 import java.io.File;
 import java.util.Iterator;
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 e6bf1f1f..2aa1da07 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
@@ -19,8 +19,8 @@ package org.apache.maven.plugins.scm;
 
 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;
 
 import java.io.File;