svn commit: r694031 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

[jdcasey]

Author: jdcasey
Date: Wed Sep 10 15:11:50 2008
New Revision: 694031

URL: http://svn.apache.org/viewvc?rev=694031&view=rev
Log:
fixing handling when dependency POMs are invalid.

Modified:
    
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

Modified: 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=694031&r1=694030&r2=694031&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 Wed Sep 10 15:11:50 2008
@@ -95,14 +95,21 @@
             return artifact;
         }
 
+        
+        // NOTE: Using artifact information here, since some POMs are deployed 
+        // to central with one version in the filename, but another in the 
<version> string!
+        // Case in point: org.apache.ws.commons:XmlSchema:1.1:pom.
+        //
+        // Since relocation triggers a reconfiguration of the artifact's 
information
+        // in retrieveRelocatedProject(..), this is safe to do.
         Artifact result = null;
         if ( artifact.getClassifier() != null )
         {
-            result = artifactFactory.createArtifactWithClassifier( 
project.getGroupId(), project.getArtifactId(), project.getVersion(), 
artifact.getType(), artifact.getClassifier() );
+            result = artifactFactory.createArtifactWithClassifier( 
artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), 
artifact.getType(), artifact.getClassifier() );
         }
         else
         {
-            result = artifactFactory.createArtifact( project.getGroupId(), 
project.getArtifactId(), project.getVersion(), artifact.getScope(), 
artifact.getType() );
+            result = artifactFactory.createArtifact( artifact.getGroupId(), 
artifact.getArtifactId(), artifact.getVersion(), artifact.getScope(), 
artifact.getType() );
         }
 
         result.setResolved( artifact.isResolved() );