cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver DefaultArtifactResolver.java

[brett]

brett       2005/03/24 08:08:48

  Modified:    maven-core/src/main/java/org/apache/maven/project
                        MavenProject.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver
                        DefaultArtifactResolver.java
  Log:
  more bug fixes for artifact cloning
  
  Revision  Changes    Path
  1.35      +2 -0      
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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- MavenProject.java 24 Mar 2005 05:01:05 -0000      1.34
  +++ MavenProject.java 24 Mar 2005 16:08:48 -0000      1.35
  @@ -710,6 +710,8 @@
                                                                                
       existing.getVersion(),
                                                                                
       a.getScope(), existing.getType() );
   
  +                    artifact.setFile( existing.getFile() );
  +
                       artifacts.put( id, artifact );
                   }
               }
  
  
  
  1.32      +2 -0      
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
  
  Index: DefaultArtifactResolver.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DefaultArtifactResolver.java      24 Mar 2005 16:03:51 -0000      1.31
  +++ DefaultArtifactResolver.java      24 Mar 2005 16:08:48 -0000      1.32
  @@ -310,6 +310,8 @@
                                                                                
           knownVersion,
                                                                                
           newArtifact.getScope(),
                                                                                
           knownArtifact.getType() );
  +                        // don't copy file - these aren't resolved yet
  +
                           resolvedArtifacts.put( artifact.getConflictId(), 
artifact );
                       }
                   }