You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/06/18 04:48:46 UTC
svn commit: r955820 - in /maven/maven-3/trunk:
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: bentmann
Date: Fri Jun 18 02:48:46 2010
New Revision: 955820
URL: http://svn.apache.org/viewvc?rev=955820&view=rev
Log:
o Restored backward-compat with Maven 2.x
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=955820&r1=955819&r2=955820&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Fri Jun 18 02:48:46 2010
@@ -537,15 +537,6 @@ public class DefaultLegacyArtifactCollec
{
break;
}
-
- Artifact relocated = rGroup.getRelocatedArtifact();
- if ( relocated != null && !artifact.equals( relocated ) )
- {
- relocated.setDependencyFilter( artifact.getDependencyFilter() );
- artifact = relocated;
- child.setArtifact( artifact );
- metadataRequest.setArtifact( artifact );
- }
}
while( !childKey.equals( child.getKey() ) );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=955820&r1=955819&r2=955820&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Fri Jun 18 02:48:46 2010
@@ -535,23 +535,23 @@ public class MavenMetadataSource
MavenProject project;
Artifact pomArtifact;
- Artifact relocatedArtifact = artifact;
+ Artifact relocatedArtifact = null;
boolean done = false;
do
{
project = null;
pomArtifact =
- repositorySystem.createProjectArtifact( relocatedArtifact.getGroupId(),
- relocatedArtifact.getArtifactId(),
- relocatedArtifact.getVersion(), relocatedArtifact.getScope() );
+ repositorySystem.createProjectArtifact( artifact.getGroupId(),
+ artifact.getArtifactId(),
+ artifact.getVersion(), artifact.getScope() );
- if ( "pom".equals( relocatedArtifact.getType() ) )
+ if ( "pom".equals( artifact.getType() ) )
{
- pomArtifact.setFile( relocatedArtifact.getFile() );
+ pomArtifact.setFile( artifact.getFile() );
}
- if ( Artifact.SCOPE_SYSTEM.equals( relocatedArtifact.getScope() ) )
+ if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
done = true;
}
@@ -581,27 +581,27 @@ public class MavenMetadataSource
if ( missingParentPom != null )
{
throw new ArtifactMetadataRetrievalException( "Failed to process POM for "
- + relocatedArtifact.getId() + ": " + missingParentPom.getMessage(),
+ + artifact.getId() + ": " + missingParentPom.getMessage(),
missingParentPom.getException(),
- relocatedArtifact );
+ artifact );
}
String message;
if ( e.getCause() instanceof MultipleArtifactsNotFoundException )
{
- message = "Missing POM for " + relocatedArtifact.getId();
+ message = "Missing POM for " + artifact.getId();
}
else if ( e.getCause() instanceof ArtifactResolutionException )
{
throw new ArtifactMetadataRetrievalException( "Failed to retrieve POM for "
- + relocatedArtifact.getId() + ": " + e.getCause().getMessage(), e.getCause(),
- relocatedArtifact );
+ + artifact.getId() + ": " + e.getCause().getMessage(), e.getCause(),
+ artifact );
}
else
{
message =
- "Invalid POM for " + relocatedArtifact.getId()
+ "Invalid POM for " + artifact.getId()
+ ", transitive dependencies (if any) will not be available"
+ ", enable debug logging for more details";
}
@@ -623,36 +623,34 @@ public class MavenMetadataSource
{
relocation = distMgmt.getRelocation();
- relocatedArtifact.setDownloadUrl( distMgmt.getDownloadUrl() );
+ artifact.setDownloadUrl( distMgmt.getDownloadUrl() );
pomArtifact.setDownloadUrl( distMgmt.getDownloadUrl() );
}
if ( relocation != null )
{
- if ( relocatedArtifact == artifact )
- {
- relocatedArtifact = ArtifactUtils.copyArtifact( artifact );
- }
-
if ( relocation.getGroupId() != null )
{
- relocatedArtifact.setGroupId( relocation.getGroupId() );
+ artifact.setGroupId( relocation.getGroupId() );
+ relocatedArtifact = artifact;
project.setGroupId( relocation.getGroupId() );
}
if ( relocation.getArtifactId() != null )
{
- relocatedArtifact.setArtifactId( relocation.getArtifactId() );
+ artifact.setArtifactId( relocation.getArtifactId() );
+ relocatedArtifact = artifact;
project.setArtifactId( relocation.getArtifactId() );
}
if ( relocation.getVersion() != null )
{
// note: see MNG-3454. This causes a problem, but fixing it may break more.
- relocatedArtifact.setVersionRange( VersionRange.createFromVersion( relocation.getVersion() ) );
+ artifact.setVersionRange( VersionRange.createFromVersion( relocation.getVersion() ) );
+ relocatedArtifact = artifact;
project.setVersion( relocation.getVersion() );
}
if ( artifact.getDependencyFilter() != null
- && !artifact.getDependencyFilter().include( relocatedArtifact ) )
+ && !artifact.getDependencyFilter().include( artifact ) )
{
return null;
}
@@ -665,14 +663,14 @@ public class MavenMetadataSource
{
MetadataResolutionRequest metadataRequest =
new DefaultMetadataResolutionRequest( repositoryRequest );
- metadataRequest.setArtifact( relocatedArtifact );
+ metadataRequest.setArtifact( artifact );
available = retrieveAvailableVersions( metadataRequest );
- relocatedArtifact.setAvailableVersions( available );
+ artifact.setAvailableVersions( available );
}
String message =
- "\n This artifact has been relocated to " + relocatedArtifact.getGroupId() + ":"
- + relocatedArtifact.getArtifactId() + ":" + relocatedArtifact.getVersion() + ".\n";
+ "\n This artifact has been relocated to " + artifact.getGroupId() + ":"
+ + artifact.getArtifactId() + ":" + artifact.getVersion() + ".\n";
if ( relocation.getMessage() != null )
{
@@ -706,7 +704,7 @@ public class MavenMetadataSource
ProjectRelocation rel = new ProjectRelocation();
rel.project = project;
rel.pomArtifact = pomArtifact;
- rel.relocatedArtifact = ( relocatedArtifact == artifact ) ? null : relocatedArtifact;
+ rel.relocatedArtifact = relocatedArtifact;
return rel;
}