From 34a6140bef48f938d8537a647e0b97c8f3382096 Mon Sep 17 00:00:00 2001
From: John Dennis Casey <jdcasey@apache.org>
Date: Thu, 23 Jun 2005 06:23:17 +0000
Subject: [PATCH] Adding wagon-file to the deps list for maven-core; adding
 artifact-exclusions for everything found in -maven.home- /lib in
 DefaultPluginManager.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193088 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-core/pom.xml                                    |  6 ++++++
 .../org/apache/maven/plugin/DefaultPluginManager.java | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 56bcc948cf..03a59982e2 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -100,6 +100,12 @@
       <version>1.0-alpha-4</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-file</artifactId>
+      <version>1.0-alpha-4</version>
+      <scope>runtime</scope>
+    </dependency>
     
     <!-- used to prompt the user to add plugin versions to the plugin-registry. -->
     <dependency>
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
index 80def18a05..bae7ec7708 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -980,6 +980,10 @@ public class DefaultPluginManager
         // TODO: configure this from bootstrap or scan lib
         Set artifacts = new HashSet();
         artifacts.add( "classworlds" );
+        artifacts.add( "commons-cli" );
+        artifacts.add( "commons-validator" );
+        artifacts.add( "jline" );
+        artifacts.add( "jsch" );
         artifacts.add( "maven-artifact" );
         artifacts.add( "maven-artifact-manager" );
         artifacts.add( "maven-core" );
@@ -989,16 +993,17 @@ public class DefaultPluginManager
         artifacts.add( "maven-plugin-descriptor" );
         artifacts.add( "maven-project" );
         artifacts.add( "maven-settings" );
+        artifacts.add( "oro" );
         artifacts.add( "plexus-container-default" );
+        artifacts.add( "plexus-input-handler" );
         artifacts.add( "plexus-utils" );
         artifacts.add( "wagon-provider-api" );
-        artifacts.add( "wagon-ssh" );
-        artifacts.add( "wagon-http-lightweight" );
         artifacts.add( "wagon-file" );
+        artifacts.add( "wagon-http-lightweight" );
+        artifacts.add( "wagon-ssh" );
         // TODO: remove doxia
         artifacts.add( "doxia-core" );
         artifacts.add( "maven-reporting-api" );
-        artifacts.add( "plexus-input-handler" );
         artifactFilter = new ExclusionSetFilter( artifacts );
     }