brett 2004/12/03 22:12:34
Modified: src/java/org/apache/maven/verifier Tag: MAVEN-1_0-BRANCH
DependencyVerifier.java
Log:
PR: MAVEN-1518
Make sure a dependency is not downloaded if it has been overriden
Revision Changes Path
No revision
No revision
1.34.4.12 +12 -1
maven/src/java/org/apache/maven/verifier/DependencyVerifier.java
Index: DependencyVerifier.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/verifier/DependencyVerifier.java,v
retrieving revision 1.34.4.11
retrieving revision 1.34.4.12
diff -u -r1.34.4.11 -r1.34.4.12
--- DependencyVerifier.java 4 Nov 2004 10:56:20 -0000 1.34.4.11
+++ DependencyVerifier.java 4 Dec 2004 06:12:34 -0000 1.34.4.12
@@ -254,6 +254,17 @@
{
Artifact artifact = (Artifact) i.next();
+ // before we try to download a missing dependency we have to
verify
+ // that the dependency is not of the type Artifact.OVERRIDE_PATH,
+ // in which case it can not be downloaded. Just skip this
iteration.
+ // Since the dependency won't get removed from the
failedDependencies list
+ // an error message will be created.
+ String overrideType = artifact.getOverrideType();
+ if ( overrideType == Artifact.OVERRIDE_PATH )
+ {
+ continue;
+ }
+
// The directory structure for the project this dependency
belongs to
// may not exists so attempt to create the project directory
structure
// before attempting to download the dependency.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
