Index: /home/herve/projet/workspace/maven-ant-tasks/pom.xml
===================================================================
--- /home/herve/projet/workspace/maven-ant-tasks/pom.xml	(revision 521859)
+++ /home/herve/projet/workspace/maven-ant-tasks/pom.xml	(working copy)
@@ -31,7 +31,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1</version>
         <configuration>
           <descriptor>src/main/assembly/dep.xml</descriptor>
         </configuration>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0.5</version>
       <exclusions>
         <exclusion>
           <artifactId>junit</artifactId>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-error-diagnostics</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
@@ -69,6 +69,7 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
+      <version>1.0-alpha-7</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -74,6 +75,7 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http-lightweight</artifactId>
+      <version>1.0-alpha-6</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -84,7 +86,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact-manager</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0.5</version>
       <exclusions>
         <exclusion>
           <artifactId>junit</artifactId>
@@ -95,6 +97,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -99,7 +102,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
@@ -104,6 +107,7 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
+      <version>1.0-alpha-6</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -108,6 +112,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-9</version>
     </dependency>
   </dependencies>
 </project>
Index: /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
===================================================================
--- /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java	(revision 521859)
+++ /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java	(working copy)
@@ -35,13 +35,12 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.codehaus.plexus.classworlds.ClassWorld;
-import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
+import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.classworlds.DuplicateRealmException;
 import org.codehaus.plexus.PlexusContainerException;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.embed.Embedder;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -61,7 +60,7 @@
 {
     private Settings settings;
 
-    private PlexusContainer container;
+    private Embedder embedder;
 
     private Pom pom;
 
@@ -121,7 +120,7 @@
         {
             try
             {
-                getContainer().release( repositoryFactory );
+                getEmbedder().release( repositoryFactory );
             }
             catch ( ComponentLifecycleException e )
             {
@@ -262,7 +261,7 @@
     {
         try
         {
-            return getContainer().lookup( role );
+            return getEmbedder().lookup( role );
         }
         catch ( ComponentLookupException e )
         {
@@ -274,7 +273,7 @@
     {
         try
         {
-            return getContainer().lookup( role, roleHint );
+            return getEmbedder().lookup( role, roleHint );
         }
         catch ( ComponentLookupException e )
         {
@@ -294,14 +293,16 @@
         return remoteRepository;
     }
 
-    protected synchronized PlexusContainer getContainer()
+    protected synchronized Embedder getEmbedder()
     {
-        if ( container == null )
+        if ( embedder == null )
         {
-            container = (PlexusContainer) getProject().getReference( PlexusContainer.class.getName() );
+            embedder = (Embedder) getProject().getReference( Embedder.class.getName() );
 
-            if ( container == null )
+            if ( embedder == null )
             {
+                embedder = new Embedder();
+
                 try
                 {
                     ClassWorld classWorld = new ClassWorld();
@@ -308,8 +309,7 @@
 
                     classWorld.newRealm( "plexus.core", getClass().getClassLoader() );
 
-                    container = new DefaultPlexusContainer( null, null, classWorld );
-
+                    embedder.start( classWorld );
                 }
                 catch ( PlexusContainerException e )
                 {
@@ -320,11 +320,10 @@
                     throw new BuildException( "Unable to create embedder ClassRealm", e );
                 }
 
-                getProject().addReference( PlexusContainer.class.getName(),container );
+                getProject().addReference( Embedder.class.getName(), embedder );
             }
         }
-
-        return container;
+        return embedder;
     }
 
     public Pom buildPom( MavenProjectBuilder projectBuilder, ArtifactRepository localArtifactRepository )
@@ -373,7 +372,7 @@
     {
         try
         {
-            ErrorDiagnostics diagnostics = (ErrorDiagnostics) container.lookup( ErrorDiagnostics.ROLE );
+            ErrorDiagnostics diagnostics = (ErrorDiagnostics) embedder.lookup( ErrorDiagnostics.ROLE );
 
             StringBuffer message = new StringBuffer();
 
@@ -429,7 +428,7 @@
     protected Artifact createArtifact( Pom pom )
     {
         ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
-        // TODO: maybe not strictly correct, while we should enfore that packaging has a type handler of the same id, we don't
+        // TODO: maybe not strictly correct, while we should enforce that packaging has a type handler of the same id, we don't
         return factory.createBuildArtifact( pom.getGroupId(), pom.getArtifactId(), pom.getVersion(),
                                             pom.getPackaging() );
     }
Index: /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
===================================================================
--- /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java	(revision 521859)
+++ /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java	(working copy)
@@ -119,7 +119,7 @@
             {
                 Artifact a = (Artifact) i.next();
 
-                getContainer().addJarResource( a.getFile() );
+                getEmbedder().getContainer().addJarResource( a.getFile() );
             }
         }
         catch ( PlexusContainerException e )
Index: /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/Repository.java
===================================================================
--- /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/Repository.java	(revision 521859)
+++ /home/herve/projet/workspace/maven-ant-tasks/src/main/java/org/apache/maven/artifact/ant/Repository.java	(working copy)
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
 
 /**
@@ -29,7 +28,7 @@
     extends ProjectComponent
 {
     private String id;
-    
+
     private String refid;
 
     private String layout = "default";
@@ -42,7 +41,7 @@
         }
         return getInstance().id;
     }
-    
+
     public void setId( String id )
     {
         this.id = id;
@@ -47,7 +46,7 @@
     {
         this.id = id;
     }
-    
+
     public String getRefid()
     {
         return refid;