Mailing-List: contact m2-dev-help@maven.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Maven 2 Developers List" <m2-dev@maven.apache.org>
Date: 24 Oct 2004 18:31:02 -0000
Message-ID: <20041024183102.3304.qmail@minotaur.apache.org>
From: jvanzyl@apache.org
To: maven-components-cvs@apache.org
Subject: cvs commit:
 maven-components/maven-core/src/main/java/org/apache/maven/plugin
 DefaultPluginManager.java

jvanzyl     2004/10/24 11:31:02

  Modified:    maven-core/src/main/java/org/apache/maven/plugin
                        DefaultPluginManager.java
  Log:
  o don't need to block out xstream anymore, it's not a core dep any longer
  
  Revision  Changes    Path
  1.16      +15 -27    maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  Index: DefaultPluginManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultPluginManager.java	24 Oct 2004 18:15:08 -0000	1.15
  +++ DefaultPluginManager.java	24 Oct 2004 18:31:02 -0000	1.16
  @@ -1,28 +1,16 @@
   package org.apache.maven.plugin;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  - *
  - * Licensed under the Apache License, Version 2.0 (the "License");
  - * you may not use this file except in compliance with the License.
  - * You may obtain a copy of the License at
  - *
  - *      http://www.apache.org/licenses/LICENSE-2.0
  - *
  - * Unless required by applicable law or agreed to in writing, software
  - * distributed under the License is distributed on an "AS IS" BASIS,
  - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  - * See the License for the specific language governing permissions and
  - * limitations under the License.
  + * Copyright 2001-2004 The Apache Software Foundation. Licensed under the Apache
  + * License, Version 2.0 (the "License"); you may not use this file except in
  + * compliance with the License. You may obtain a copy of the License at
  + * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
  + * or agreed to in writing, software distributed under the License is
  + * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  + * KIND, either express or implied. See the License for the specific language
  + * governing permissions and limitations under the License.
    */
   
  -import java.util.HashMap;
  -import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Set;
  -
   import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.DefaultArtifact;
   import org.apache.maven.artifact.MavenMetadataSource;
  @@ -34,7 +22,6 @@
   import org.apache.maven.plugin.descriptor.MojoDescriptor;
   import org.apache.maven.plugin.descriptor.PluginDescriptor;
   import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
  -
   import org.codehaus.plexus.ArtifactEnabledContainer;
   import org.codehaus.plexus.PlexusConstants;
   import org.codehaus.plexus.PlexusContainer;
  @@ -48,6 +35,13 @@
   import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
   import org.codehaus.plexus.util.dag.CycleDetectedException;
   
  +import java.util.HashMap;
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Set;
  +
   public class DefaultPluginManager
       extends AbstractLogEnabled
       implements PluginManager, ComponentDiscoveryListener, Initializable, Contextualizable
  @@ -190,11 +184,6 @@
               // Now, we need to resolve the plugins for this goal's prereqs.
               MojoDescriptor mojoDescriptor = getMojoDescriptor( goalName );
   
  -            if ( mojoDescriptor == null )
  -            {
  -                throw new Exception( "Could not find a mojo descriptor for goal: '" + goalName + "'." );
  -            }
  -
               List prereqs = mojoDescriptor.getPrereqs();
   
               if ( prereqs != null )
  @@ -242,7 +231,6 @@
               "maven-model",
               "maven-plugin",
               "plexus",
  -            "xstream",
               "xpp3",
               "classworlds",
               "ognl"