mirror of https://github.com/apache/maven.git
o notes for oleg about what's left to remove from the repository interface
o more cleanup git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751091 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6f2e00b622
commit
c04ee12962
|
@ -34,7 +34,6 @@ import org.apache.maven.ArtifactFilterManager;
|
|||
import org.apache.maven.artifact.Artifact;
|
||||
import org.apache.maven.artifact.ArtifactUtils;
|
||||
import org.apache.maven.artifact.factory.ArtifactFactory;
|
||||
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
|
||||
import org.apache.maven.artifact.metadata.ResolutionGroup;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
|
||||
|
@ -101,8 +100,6 @@ import org.codehaus.plexus.component.repository.exception.ComponentRepositoryExc
|
|||
import org.codehaus.plexus.configuration.PlexusConfiguration;
|
||||
import org.codehaus.plexus.configuration.PlexusConfigurationException;
|
||||
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
|
||||
import org.codehaus.plexus.context.Context;
|
||||
import org.codehaus.plexus.context.ContextException;
|
||||
import org.codehaus.plexus.logging.Logger;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
import org.codehaus.plexus.util.xml.Xpp3Dom;
|
||||
|
@ -1354,7 +1351,10 @@ public class DefaultPluginManager
|
|||
|
||||
ArtifactFilter filter = new ScopeArtifactFilter( scope );
|
||||
|
||||
ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( artifact ).setResolveRoot( false ).setArtifactDependencies( project.getDependencyArtifacts() )
|
||||
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
|
||||
.setArtifact( artifact )
|
||||
.setResolveRoot( false )
|
||||
.setArtifactDependencies( project.getDependencyArtifacts() )
|
||||
.setLocalRepository( context.getLocalRepository() )
|
||||
.setRemoteRepostories( project.getRemoteArtifactRepositories() )
|
||||
.setManagedVersionMap( project.getManagedVersionMap() )
|
||||
|
|
|
@ -24,10 +24,6 @@ import org.apache.maven.profiles.ProfileManager;
|
|||
|
||||
public interface MavenProjectBuilder
|
||||
{
|
||||
boolean STRICT_MODEL_PARSING = true;
|
||||
|
||||
// Used directly by plugins
|
||||
|
||||
// site
|
||||
MavenProject build( File project, ArtifactRepository localRepository, ProfileManager profileManager )
|
||||
throws ProjectBuildingException;
|
||||
|
|
|
@ -29,9 +29,7 @@ import org.apache.maven.artifact.Artifact;
|
|||
import org.apache.maven.artifact.InvalidRepositoryException;
|
||||
import org.apache.maven.artifact.factory.ArtifactFactory;
|
||||
import org.apache.maven.artifact.manager.WagonManager;
|
||||
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
|
||||
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
|
||||
import org.apache.maven.artifact.metadata.ResolutionGroup;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
|
||||
|
@ -43,7 +41,6 @@ import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
|
|||
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
|
||||
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
|
||||
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
|
||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
|
||||
import org.apache.maven.artifact.versioning.VersionRange;
|
||||
import org.apache.maven.model.Dependency;
|
||||
|
@ -51,7 +48,6 @@ import org.apache.maven.model.Exclusion;
|
|||
import org.apache.maven.model.Repository;
|
||||
import org.apache.maven.model.RepositoryPolicy;
|
||||
import org.apache.maven.wagon.authentication.AuthenticationInfo;
|
||||
import org.apache.maven.wagon.events.TransferListener;
|
||||
import org.apache.maven.wagon.proxy.ProxyInfo;
|
||||
import org.apache.maven.wagon.repository.RepositoryPermissions;
|
||||
import org.codehaus.plexus.component.annotations.Component;
|
||||
|
@ -277,12 +273,6 @@ public class LegacyMavenRepositorySystem
|
|||
return projectArtifacts;
|
||||
}
|
||||
|
||||
public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
|
||||
throws ArtifactMetadataRetrievalException
|
||||
{
|
||||
return artifactMetadataSource.retrieve( artifact, localRepository, remoteRepositories );
|
||||
}
|
||||
|
||||
public ArtifactRepository buildArtifactRepository( Repository repo )
|
||||
throws InvalidRepositoryException
|
||||
{
|
||||
|
|
|
@ -60,6 +60,9 @@ public interface MavenRepositorySystem
|
|||
|
||||
Artifact createDependencyArtifact( String groupId, String artifactId, String version, String type, String classifier, String scope, String inheritedScope );
|
||||
|
||||
//REMOVE
|
||||
// This will disappear when we actually deal with resolving a root dependency and its dependencies. This is used everywhere because of that
|
||||
// deficiency
|
||||
Set<Artifact> createArtifacts( List<Dependency> dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor )
|
||||
throws VersionNotFoundException;
|
||||
|
||||
|
@ -75,12 +78,14 @@ public interface MavenRepositorySystem
|
|||
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
|
||||
|
||||
//MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request );
|
||||
|
||||
|
||||
//REMOVE
|
||||
// Network enablement: this needs to go as we will know at a higher level from the embedder if the system is offline or not, we should not have to
|
||||
// deal with this here.
|
||||
void setOnline( boolean online );
|
||||
boolean isOnline();
|
||||
|
||||
//REMOVE
|
||||
// These should be associated with repositories and the repositories should be examine as part of metadatda and
|
||||
// artifact resolution. So these methods should also not be here.
|
||||
void addProxy( String protocol, String host, int port, String username, String password, String nonProxyHosts );
|
||||
|
|
Loading…
Reference in New Issue