o Removed authorative flag from artifact, we can just use the resolved flag to stop the resolution process

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@799692 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-07-31 18:45:18 +00:00
parent f770dc82d6
commit 82005766ac
5 changed files with 4 additions and 27 deletions

View File

@ -150,8 +150,5 @@ public interface Artifact
boolean isSelectedVersionKnown() boolean isSelectedVersionKnown()
throws OverConstrainedVersionException; throws OverConstrainedVersionException;
void setFromAuthoritativeRepository( boolean fromAuthoritativeRepository ); }
boolean isFromAuthoritativeRepository();
}

View File

@ -593,18 +593,5 @@ public class DefaultArtifact
{ {
this.optional = optional; this.optional = optional;
} }
//
private boolean fromAuthoritativeRepository;
public void setFromAuthoritativeRepository( boolean fromAuthoritativeRepository )
{
this.fromAuthoritativeRepository = fromAuthoritativeRepository;
}
public boolean isFromAuthoritativeRepository()
{
return fromAuthoritativeRepository;
}
} }

View File

@ -136,7 +136,7 @@ public class DefaultArtifactResolver
artifact = localRepository.find( artifact ); artifact = localRepository.find( artifact );
if ( artifact.isFromAuthoritativeRepository() ) if ( artifact.isResolved() )
{ {
return; return;
} }

View File

@ -42,8 +42,6 @@ public class ReactorArtifactRepository
{ {
artifact.setFile( project.getFile() ); artifact.setFile( project.getFile() );
artifact.setFromAuthoritativeRepository( true );
artifact.setResolved( true ); artifact.setResolved( true );
} }
else else
@ -60,8 +58,6 @@ public class ReactorArtifactRepository
artifact.setFile( projectArtifact.getFile() ); artifact.setFile( projectArtifact.getFile() );
artifact.setFromAuthoritativeRepository( true );
artifact.setResolved( true ); artifact.setResolved( true );
} }
// TODO: The code below supports MNG-3043 & MNG-2871 but in its current form causes MNG-4269. // TODO: The code below supports MNG-3043 & MNG-2871 but in its current form causes MNG-4269.
@ -83,8 +79,6 @@ public class ReactorArtifactRepository
// { // {
// artifact.setFile( classesDir ); // artifact.setFile( classesDir );
// //
// artifact.setFromAuthoritativeRepository( true );
//
// artifact.setResolved( true ); // artifact.setResolved( true );
// } // }
// } // }

View File

@ -27,7 +27,6 @@ public class TestIdeWorkspaceRepository
{ {
artifact.setFile( ARTIFACT_FILE ); artifact.setFile( ARTIFACT_FILE );
artifact.setResolved( true ); artifact.setResolved( true );
artifact.setFromAuthoritativeRepository( true );
} }
return artifact; return artifact;
} }