Author: brett
Date: Wed May 4 07:03:03 2005
New Revision: 168129
URL: http://svn.apache.org/viewcvs?rev=168129&view=rev
Log:
use the correct resolved version for a dependency even if it was previously
downloaded.
Modified:
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java
Modified:
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java?rev=168129&r1=168128&r2=168129&view=diff
==============================================================================
---
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
(original)
+++
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
Wed May 4 07:03:03 2005
@@ -13,6 +13,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
public class ArtifactDownloader
{
@@ -36,7 +38,7 @@
private static final String REPO_URL = "http://repo1.maven.org/maven2";;
- private Set downloadedArtifacts = new HashSet();
+ private Map downloadedArtifacts = new HashMap();
public ArtifactDownloader( Repository localRepository, List
remoteRepositories )
throws Exception
@@ -72,7 +74,8 @@
{
Dependency dep = (Dependency) j.next();
- if ( !downloadedArtifacts.contains( dep ) )
+ String dependencyConflictId = dep.getDependencyConflictId();
+ if ( !downloadedArtifacts.containsKey( dependencyConflictId ) )
{
File destinationFile = localRepository.getArtifactFile( dep );
// The directory structure for this project may
@@ -97,7 +100,12 @@
throw new DownloadFailedException( "Failed to download " +
dep );
}
- downloadedArtifacts.add( dep );
+ downloadedArtifacts.put( dependencyConflictId, dep );
+ }
+ else
+ {
+ Dependency d = (Dependency) downloadedArtifacts.get(
dependencyConflictId );
+ dep.setResolvedVersion( d.getResolvedVersion() );
}
}
}
Modified:
maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java?rev=168129&r1=168128&r2=168129&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java
(original)
+++ maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java Wed
May 4 07:03:03 2005
@@ -250,6 +250,11 @@
return getGroupId() + ":" + getArtifactId() + ":" + getType();
}
+ public String getDependencyConflictId()
+ {
+ return getGroupId() + ":" + getArtifactId() + ":" + getType() + ":" +
getVersion();
+ }
+
public void setResolvedVersion( String resolvedVersion )
{
this.resolvedVersion = resolvedVersion;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
