Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more bug fixes for artifact cloning 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163694 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-03-24 16:08:48 +00:00
parent b529deb2df
commit ff261cd131
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
View File

@ -310,6 +310,8 @@ public class DefaultArtifactResolver
knownVersion, knownVersion,
newArtifact.getScope(), newArtifact.getScope(),
knownArtifact.getType() ); knownArtifact.getType() );
// don't copy file - these aren't resolved yet
resolvedArtifacts.put( artifact.getConflictId(), artifact ); resolvedArtifacts.put( artifact.getConflictId(), artifact );
} }
} }

2
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -710,6 +710,8 @@ public class MavenProject
existing.getVersion(), existing.getVersion(),
a.getScope(), existing.getType() ); a.getScope(), existing.getType() );
artifact.setFile( existing.getFile() );
artifacts.put( id, artifact ); artifacts.put( id, artifact );
} }
} }