You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2005/03/24 17:16:49 UTC

cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project ProjectClasspathArtifactResolver.java

brett       2005/03/24 08:16:49

  Modified:    maven-core/src/main/java/org/apache/maven/project
                        MavenProject.java
               maven-core/src/test/java/org/apache/maven/project
                        ProjectClasspathArtifactResolver.java
  Log:
  can't do this yet
  
  Revision  Changes    Path
  1.36      +2 -1      maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
  
  Index: MavenProject.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- MavenProject.java	24 Mar 2005 16:08:48 -0000	1.35
  +++ MavenProject.java	24 Mar 2005 16:16:49 -0000	1.36
  @@ -710,7 +710,8 @@
                                                                                       existing.getVersion(),
                                                                                       a.getScope(), existing.getType() );
   
  -                    artifact.setFile( existing.getFile() );
  +                    // TODO: should copy files if it is set
  +//                    artifact.setFile( existing.getFile() );
   
                       artifacts.put( id, artifact );
                   }
  
  
  
  1.6       +2 -0      maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
  
  Index: ProjectClasspathArtifactResolver.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ProjectClasspathArtifactResolver.java	23 Mar 2005 08:42:56 -0000	1.5
  +++ ProjectClasspathArtifactResolver.java	24 Mar 2005 16:16:49 -0000	1.6
  @@ -31,6 +31,7 @@
   import org.apache.maven.model.Model;
   import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
   
  +import java.io.File;
   import java.io.InputStreamReader;
   import java.util.List;
   import java.util.Set;
  @@ -70,6 +71,7 @@
       public Artifact resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
           throws ArtifactResolutionException
       {
  +        artifact.setFile( new File( "dummy" ) );
           return artifact;
       }