mirror of https://github.com/apache/maven.git
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:
parent
b529deb2df
commit
ff261cd131
|
@ -310,6 +310,8 @@ public class DefaultArtifactResolver
|
|||
knownVersion,
|
||||
newArtifact.getScope(),
|
||||
knownArtifact.getType() );
|
||||
// don't copy file - these aren't resolved yet
|
||||
|
||||
resolvedArtifacts.put( artifact.getConflictId(), artifact );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -710,6 +710,8 @@ public class MavenProject
|
|||
existing.getVersion(),
|
||||
a.getScope(), existing.getType() );
|
||||
|
||||
artifact.setFile( existing.getFile() );
|
||||
|
||||
artifacts.put( id, artifact );
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue