You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/07/16 18:33:05 UTC
svn commit: r677328 -
/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: jdcasey
Date: Wed Jul 16 09:33:04 2008
New Revision: 677328
URL: http://svn.apache.org/viewvc?rev=677328&view=rev
Log:
[MNG-3667] Use resolved artifact groupId/artifactId/version rather than that read directly from the resolved POM, in case the POM was added to the repository by a non-Maven process and contains bad information (see org.apache.ws.commons:XmlSchema:1.1:pom for an example).
Modified:
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=677328&r1=677327&r2=677328&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Jul 16 09:33:04 2008
@@ -101,14 +101,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() );