o the assembly of the maven runtime more closely resembles what the

plexus runtime generator produces so that i may attempt to use it
  some point in the near future

o flipped back to 0.9-S of wagon until I run this on beaver to
  verify

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163110 13f79535-47bb-0310-9956-ffa450edef68

maven-artifact/pom.xml

@@ -18,12 +18,12 @@
     <dependency>
       <groupId>maven</groupId>
       <artifactId>wagon-api</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>wagon-http-lightweight</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>0.9-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

maven-core/pom.xml

@@ -52,17 +52,11 @@
       <artifactId>ognl</artifactId>
       <version>2.5.1</version>
     </dependency>
-    <!-- Wagon -->
     <dependency>
       <groupId>maven</groupId>
       <artifactId>wagon-api</artifactId>
       <version>1.0-alpha-1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>maven</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-    </dependency>
+    </dependency>    
   </dependencies>
   <distributionManagement>
     <site>

maven-core/src/bin/classworlds.conf

@@ -3,9 +3,7 @@ main is org.apache.maven.MavenCli from plexus.core.maven
 set maven.home default ${user.home}/m2
 
 [plexus.core]
-load ${maven.home}/core/plexus-0.17-SNAPSHOT.jar
-load ${maven.home}/core/xstream-1.0-SNAPSHOT.jar
-load ${maven.home}/core/xpp3-1.1.3.3.jar
+load ${maven.home}/core/*.jar
 
 [plexus.core.maven]
 load ${maven.home}/lib/*.jar

maven-mboot2/src/main/java/MBoot.java

@@ -51,18 +51,19 @@ public class MBoot
         "xpp3/jars/xpp3-1.1.3.3.jar",
         "xstream/jars/xstream-1.0-SNAPSHOT.jar",
         "qdox/jars/qdox-1.2.jar",
-        "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
+        "maven/jars/wagon-http-lightweight-0.9-SNAPSHOT.jar"
     };
 
     String[] plexusDeps = new String[]
     {
         "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
         "plexus/jars/plexus-0.17-SNAPSHOT.jar",
+        "plexus/jars/plexus-artifact-container-1.0-alpha-1-SNAPSHOT.jar",
         "xpp3/jars/xpp3-1.1.3.3.jar",
         "xstream/jars/xstream-1.0-SNAPSHOT.jar",
-        //"maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
-        //"maven/jars/wagon-api-1.0-alpha-1-SNAPSHOT.jar",
-        //"maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
+        "maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
+        "maven/jars/wagon-api-0.9-SNAPSHOT.jar",
+        "maven/jars/wagon-http-lightweight-0.9-SNAPSHOT.jar"
     };
 
     String[] builds = new String[]
@@ -322,13 +323,13 @@ public class MBoot
             Dependency d = (Dependency) i.next();
 
             if ( d.getArtifactId().equals( "classworlds" ) ||
-                d.artifactId.equals( "plexus" ) ||
-                d.artifactId.equals( "xstream" ) ||
-                d.artifactId.equals( "xpp3" ) //||
-                //d.artifactId.equals( "junit" ) ||
-                //d.artifactId.equals( "wagon-api" ) ||
-                //d.artifactId.equals( "maven-artifact" ) 
-)
+                 d.artifactId.equals( "plexus" ) ||
+                 d.artifactId.equals( "xstream" ) ||
+                 d.artifactId.equals( "xpp3" ) ||
+                 d.artifactId.equals( "junit" ) ||
+                 d.artifactId.equals( "wagon-api" ) ||
+                 d.artifactId.equals( "plexus-artifact-container" ) ||
+                 d.artifactId.equals( "maven-artifact" ) )
             {
                 continue;
             }