From 17518785ac033526ce86b8f80ec3bb698a7ddee3 Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Sun, 29 May 2005 22:55:12 +0000
Subject: [PATCH] upgrade to container with separated utils

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178995 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-core/pom.xml                    | 5 +++++
 maven-mboot2/src/main/java/MBoot.java | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f58e61f29f..23019c0b53 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -85,6 +85,11 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-4-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
       <version>1.0-alpha-3</version>
     </dependency>
     <dependency>
diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
index 9613ac85fa..eb695f3c97 100644
--- a/maven-mboot2/src/main/java/MBoot.java
+++ b/maven-mboot2/src/main/java/MBoot.java
@@ -432,11 +432,12 @@ public class MBoot
             {
                 FileUtils.copyFileToDirectory( source, boot );
             }
-            else if ( d.getArtifactId().equals( "plexus-container-default" ) )
+            else if ( d.getArtifactId().equals( "plexus-container-default" ) 
+                || d.getArtifactId().equals( "plexus-utils" ) )
             {
                 FileUtils.copyFileToDirectory( source, core );
             }
-            else if ( !d.getScope().equals( SCOPE_TEST ) && !d.getArtifactId().equals( "plexus-utils" ) )
+            else if ( !d.getScope().equals( SCOPE_TEST ) )
             {
                 // only compile and runtime
                 FileUtils.copyFileToDirectory( source, lib );