From ff261cd13154e394d81390f8ae603d98bf61e10e Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Thu, 24 Mar 2005 16:08:48 +0000 Subject: [PATCH] more bug fixes for artifact cloning git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163694 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/artifact/resolver/DefaultArtifactResolver.java | 2 ++ .../src/main/java/org/apache/maven/project/MavenProject.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java index 75ef1040f3..f80ee6dcd5 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java @@ -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 ); } } diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index a6796eb33a..25045a58b7 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -710,6 +710,8 @@ public class MavenProject existing.getVersion(), a.getScope(), existing.getType() ); + artifact.setFile( existing.getFile() ); + artifacts.put( id, artifact ); } }