You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/22 08:16:26 UTC

svn commit: r164178 - /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/construction /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver /maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus /maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact /maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin /maven/components/trunk/maven-core/src/main/java/org/apache/maven/project /maven/components/trunk/maven-core/src/main/resources/META-INF/plexus /maven/components/trunk/maven-core/src/test/java/org/apache/maven/project /maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project /maven/components/trunk/maven-plugins

Author: brett
Date: Thu Apr 21 23:16:25 2005
New Revision: 164178

URL: http://svn.apache.org/viewcvs?rev=164178&view=rev
Log:
move artifact factory to maven-artifact

Added:
    maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/
      - copied from r164154, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/
    maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
      - copied, changed from r164177, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
    maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
      - copied, changed from r164177, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
Removed:
    maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/construction/ArtifactConstructionSupport.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/
Modified:
    maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
    maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
    maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
    maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
    maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
    maven/components/trunk/maven-plugins/pom.xml

Copied: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java (from r164177, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java?p2=maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java&r1=164177&r2=164178&rev=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java Thu Apr 21 23:16:25 2005
@@ -17,18 +17,13 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Dependency;
-
-import java.util.List;
-import java.util.Set;
 
 public interface ArtifactFactory
 {
     static String ROLE = ArtifactFactory.class.getName();
 
-    Set createArtifacts( List dependencies, String inheritedScope );
-
     Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type,
                              String inheritedScope );
+
+    Artifact createArtifact( String groupId, String artifactId, String knownVersion, String scope, String type );
 }

Copied: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (from r164177, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?p2=maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java&r1=164177&r2=164178&rev=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java Thu Apr 21 23:16:25 2005
@@ -17,41 +17,57 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.construction.ArtifactConstructionSupport;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Dependency;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import org.apache.maven.artifact.DefaultArtifact;
 
 public class DefaultArtifactFactory
-    extends ArtifactConstructionSupport
     implements ArtifactFactory
 {
-    public Set createArtifacts( List dependencies, String inheritedScope )
+    public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type )
     {
-        Set projectArtifacts = new HashSet();
+        return createArtifact( groupId, artifactId, version, scope, type, null, null );
+    }
+
+    public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String scope,
+                                                  String type, String classifier )
+    {
+        return createArtifact( groupId, artifactId, version, scope, type, classifier, null );
+    }
+
+    public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type,
+                                    String inheritedScope )
+    {
+        return createArtifact( groupId, artifactId, version, scope, type, null, inheritedScope );
+    }
 
-        for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+    public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type,
+                                    String classifier, String inheritedScope )
+    {
+        // TODO: can refactor, use scope handler
+
+        String desiredScope = Artifact.SCOPE_RUNTIME;
+        if ( inheritedScope == null )
         {
-            Dependency d = (Dependency) i.next();
+            desiredScope = scope;
+        }
+        else if ( Artifact.SCOPE_TEST.equals( scope ) )
+        {
+            return null;
+        }
 
-            Artifact artifact = createArtifact( d, inheritedScope );
-            if ( artifact != null )
-            {
-                projectArtifacts.add( artifact );
-            }
+        // vvv added to retain compile scope. Remove if you want compile inherited as runtime
+        else if ( Artifact.SCOPE_COMPILE.equals( scope ) && Artifact.SCOPE_COMPILE.equals( inheritedScope ) )
+        {
+            desiredScope = Artifact.SCOPE_COMPILE;
         }
+        // ^^^ added to retain compile scope. Remove if you want compile inherited as runtime
 
-        return projectArtifacts;
-    }
+        if ( Artifact.SCOPE_TEST.equals( inheritedScope ) )
+        {
+            desiredScope = Artifact.SCOPE_TEST;
+        }
 
-    private Artifact createArtifact( Dependency dependency, String inheritedScope )
-    {
-        return createArtifact( dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion(),
-                               dependency.getScope(), dependency.getType(), inheritedScope );
-    }
+        DefaultArtifact artifact = new DefaultArtifact( groupId, artifactId, version, desiredScope, type, classifier );
 
+        return artifact;
+    }
 }

Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Thu Apr 21 23:16:25 2005
@@ -17,7 +17,7 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.construction.ArtifactConstructionSupport;
+import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -48,8 +48,6 @@
     extends AbstractLogEnabled
     implements ArtifactResolver
 {
-    private final ArtifactConstructionSupport artifactConstructionSupport = new ArtifactConstructionSupport();
-
     // ----------------------------------------------------------------------
     // Components
     // ----------------------------------------------------------------------
@@ -60,6 +58,8 @@
 
     private List artifactTransformations;
 
+    private ArtifactFactory artifactFactory;
+
     // ----------------------------------------------------------------------
     // Implementation
     // ----------------------------------------------------------------------
@@ -275,11 +275,10 @@
                         // TODO: Artifact factory?
                         // TODO: [jc] Is this a better way to centralize artifact construction here?
 
-                        Artifact artifact = artifactConstructionSupport.createArtifact( knownArtifact.getGroupId(),
-                                                                                        knownArtifact.getArtifactId(),
-                                                                                        knownVersion,
-                                                                                        newArtifact.getScope(),
-                                                                                        knownArtifact.getType() );
+                        Artifact artifact = artifactFactory.createArtifact( knownArtifact.getGroupId(),
+                                                                            knownArtifact.getArtifactId(),
+                                                                            knownVersion, newArtifact.getScope(),
+                                                                            knownArtifact.getType() );
                         resolvedArtifacts.put( artifact.getConflictId(), artifact );
                     }
                 }

Modified: maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml Thu Apr 21 23:16:25 2005
@@ -49,6 +49,9 @@
           <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
           <field-name>artifactTransformations</field-name>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
       </requirements>
     </component>
 
@@ -173,5 +176,9 @@
       <implementation>org.apache.maven.artifact.handler.WarHandler</implementation>
     </component>
 
+    <component>
+      <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+      <implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
+    </component>
   </components>
 </component-set>

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java Thu Apr 21 23:16:25 2005
@@ -23,6 +23,7 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.project.MavenProject;
@@ -34,6 +35,8 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -131,6 +134,25 @@
                 IoUtils.close( reader );
             }
         }
-        return artifactFactory.createArtifacts( dependencies, artifact.getScope() );
+        return createArtifacts( dependencies, artifact.getScope() );
+    }
+
+    protected Set createArtifacts( List dependencies, String inheritedScope )
+    {
+        Set projectArtifacts = new HashSet();
+
+        for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+        {
+            Dependency d = (Dependency) i.next();
+
+            Artifact artifact = artifactFactory.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(),
+                                                                d.getScope(), d.getType(), inheritedScope );
+            if ( artifact != null )
+            {
+                projectArtifacts.add( artifact );
+            }
+        }
+
+        return projectArtifacts;
     }
 }

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Thu Apr 21 23:16:25 2005
@@ -760,7 +760,7 @@
                                                                                 context.getLocalRepository(),
                                                                                 sourceReader, filter );
 
-        project.addArtifacts( result.getArtifacts().values() );
+        project.addArtifacts( result.getArtifacts().values(), artifactFactory );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Apr 21 23:16:25 2005
@@ -30,6 +30,7 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
 import org.apache.maven.project.injection.ModelDefaultsInjector;
@@ -62,6 +63,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
 
 /**
  * @version $Id: DefaultMavenProjectBuilder.java,v 1.37 2005/03/08 01:55:22
@@ -75,7 +78,6 @@
 
     private ArtifactResolver artifactResolver;
 
-    // TODO: comes from Maven CORE
     private ArtifactFactory artifactFactory;
 
     private ModelInheritanceAssembler modelInheritanceAssembler;
@@ -251,7 +253,7 @@
 
         project.setParent( parentProject );
         project.setRemoteArtifactRepositories( remoteRepositories );
-        project.setArtifacts( artifactFactory.createArtifacts( project.getDependencies(), null ) );
+        project.setArtifacts( createArtifacts( project.getDependencies() ) );
 
         // ----------------------------------------------------------------------
         // Typically when the project builder is being used from maven proper
@@ -274,7 +276,7 @@
                                                                                     remoteRepositories,
                                                                                     localRepository, sourceReader );
 
-            project.addArtifacts( result.getArtifacts().values() );
+            project.addArtifacts( result.getArtifacts().values(), artifactFactory );
         }
 
         ModelValidationResult validationResult = validator.validate( model );
@@ -475,6 +477,25 @@
     private static String createCacheKey( String groupId, String artifactId, String version )
     {
         return groupId + ":" + artifactId + ":" + version;
+    }
+
+    protected Set createArtifacts( List dependencies )
+    {
+        Set projectArtifacts = new HashSet();
+
+        for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+        {
+            Dependency d = (Dependency) i.next();
+
+            Artifact artifact = artifactFactory.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(),
+                                                                d.getScope(), d.getType(), null );
+            if ( artifact != null )
+            {
+                projectArtifacts.add( artifact );
+            }
+        }
+
+        return projectArtifacts;
     }
 
     public MavenProject buildStandaloneSuperProject( ArtifactRepository localRepository )

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Thu Apr 21 23:16:25 2005
@@ -19,7 +19,7 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.artifact.construction.ArtifactConstructionSupport;
+import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.CiManagement;
@@ -77,8 +77,6 @@
 
     private List collectedProjects = Collections.EMPTY_LIST;
 
-    private ArtifactConstructionSupport artifactConstructionSupport = new ArtifactConstructionSupport();
-
     public MavenProject( Model model )
     {
         this.model = model;
@@ -633,7 +631,7 @@
         this.collectedProjects = collectedProjects;
     }
 
-    public void addArtifacts( Collection newArtifacts )
+    public void addArtifacts( Collection newArtifacts, ArtifactFactory artifactFactory )
     {
         //        project.getArtifacts().addAll( result.getArtifacts().values() );
         // We need to override the scope if one declared it higher
@@ -668,10 +666,10 @@
                 {
                     // TODO: Artifact factory?
                     // TODO: [jc] Is this a better way to centralize artifact construction here?
-                    Artifact artifact = artifactConstructionSupport.createArtifact( existing.getGroupId(),
-                                                                                    existing.getArtifactId(),
-                                                                                    existing.getVersion(),
-                                                                                    a.getScope(), existing.getType() );
+                    Artifact artifact = artifactFactory.createArtifact( existing.getGroupId(),
+                                                                        existing.getArtifactId(),
+                                                                        existing.getVersion(), a.getScope(),
+                                                                        existing.getType() );
 
                     artifact.setFile( existing.getFile() );
                     artifact.setBaseVersion( existing.getBaseVersion() );

Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Thu Apr 21 23:16:25 2005
@@ -230,13 +230,6 @@
      | I realize this is duplicated but allows the project builder to work by itself
      -->
     <component>
-      <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-      <implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
-    </component>
-    <!-- ********************* FIXME *******************************************
-     | I realize this is duplicated but allows the project builder to work by itself
-     -->
-    <component>
       <role>org.apache.maven.project.path.PathTranslator</role>
       <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
     </component>

Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml Thu Apr 21 23:16:25 2005
@@ -58,6 +58,8 @@
         <settingsPath>${user.home}/.m2/settings.xml</settingsPath>
       </configuration>
     </component>
+
+    <!-- Duplicated from Maven artifact as it is used in the plugin manager -->
     <component>
       <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
       <implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java Thu Apr 21 23:16:25 2005
@@ -77,7 +77,7 @@
             {
                 IOUtil.close( r );
             }
-            return artifactFactory.createArtifacts( model.getDependencies(), artifact.getScope() );
+            return createArtifacts( model.getDependencies(), artifact.getScope() );
         }
     }
 

Modified: maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Thu Apr 21 23:16:25 2005
@@ -11,6 +11,9 @@
         <requirement>
           <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
       </requirements>
     </component>
     -->
@@ -23,6 +26,9 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
         </requirement>
       </requirements>
     </component>

Modified: maven/components/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/pom.xml?rev=164178&r1=164177&r2=164178&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/pom.xml (original)
+++ maven/components/trunk/maven-plugins/pom.xml Thu Apr 21 23:16:25 2005
@@ -67,9 +67,7 @@
     </repository>
   </distributionManagement>
   <modules>
-<!--
     <module>maven-assembly-plugin</module>
--->
     <module>maven-clean-plugin</module>
     <module>maven-compiler-plugin</module>
     <module>maven-deploy-plugin</module>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org