From 4be6542867c6f2cebef646e1e26b2b8068335aca Mon Sep 17 00:00:00 2001
From: Kenney Westerhof <kenney@apache.org>
Date: Sat, 6 Jan 2007 04:03:24 +0000
Subject: [PATCH] Update dependency on plexus-container-default to
 1.0-alpha-16-SNAPSHOT to fix child container issues when maven builds use
 extensions;

Update dependency on plexus-classworlds to 1.0-alpha-7-SNAPSHOT to fix child container
plexus-bootstrap.xml loading problems.

Define p-c-d as a direct dep for maven-embedder; if not, an older version can be used
than is specified in the parent pom (dependencyManagement is not applied to transitive deps,
which is a bug (right?)).

Alter AbstractArtifactTask.java and MavenEmbedder.java to call the proper constructor
in DefaultPlexusContainer.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493294 13f79535-47bb-0310-9956-ffa450edef68
---
 build.properties                                              | 2 +-
 .../org/apache/maven/artifact/ant/AbstractArtifactTask.java   | 2 +-
 maven-embedder/pom.xml                                        | 4 ++++
 .../main/java/org/apache/maven/embedder/MavenEmbedder.java    | 2 +-
 pom.xml                                                       | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.properties b/build.properties
index 9c841b62a0..c663459e6d 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,5 @@
 classworlds.version=1.2-alpha-6
-plexus.version=1.0-alpha-15
+plexus.version=1.0-alpha-16-SNAPSHOT
 plexus-archiver.version=1.0-alpha-8
 plexus-utils.version=1.4-alpha-1
 plexus-interactivity-api.version=1.0-alpha-4
diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
index 3027b4d60d..8884ff4300 100755
--- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
+++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
@@ -308,7 +308,7 @@ public abstract class AbstractArtifactTask
 
                     classWorld.newRealm( "plexus.core", getClass().getClassLoader() );
 
-                    container = new DefaultPlexusContainer( null, null, null, classWorld );
+                    container = new DefaultPlexusContainer( null, null, classWorld );
 
                 }
                 catch ( PlexusContainerException e )
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index ac3b13fb74..e9c3e130f7 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -70,6 +70,10 @@
       <artifactId>maven-core</artifactId>
       <version>2.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-tools</artifactId>
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
index e61b631887..999c526448 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
@@ -382,7 +382,7 @@ public class MavenEmbedder
 
         try
         {
-            container = new DefaultPlexusContainer( null, null, null, classWorld );
+            container = new DefaultPlexusContainer( null, null, classWorld );
         }
         catch ( PlexusContainerException e )
         {
diff --git a/pom.xml b/pom.xml
index 0303e8c299..3c136f8358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
   </modules>
   <properties>
     <wagonVersion>1.0-beta-2</wagonVersion>
-    <plexusVersion>1.0-alpha-15</plexusVersion>
+    <plexusVersion>1.0-alpha-16-SNAPSHOT</plexusVersion>
   </properties>
   <dependencies>
     <dependency>
@@ -172,7 +172,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-classworlds</artifactId>
-        <version>1.2-alpha-6</version>
+        <version>1.2-alpha-7-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>