Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Introduced RepositoryRequest to hold the bare minimum of items required for repo accesses 

o Added cache for metadata.xml

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@803059 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-11 10:29:38 +00:00
parent 483a0d1f90
commit 24bd8d772f
43 changed files with 990 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
View File

@ -37,6 +37,9 @@ ResolutionGroup retrieve( MetadataResolutionRequest request )
ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException;
List<ArtifactVersion> retrieveAvailableVersions( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException;
List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException;

81
maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java Normal file
View File

@ -0,0 +1,81 @@
package org.apache.maven.artifact.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.util.ArrayList;
import java.util.List;
/**
* Collects basic settings to access the repository system.
*
* @author Benjamin Bentmann
*/
public class DefaultRepositoryRequest
implements RepositoryRequest
{
private ArtifactRepository localRepository;
private List<ArtifactRepository> remoteRepositories;
private RepositoryCache cache;
public ArtifactRepository getLocalRepository()
{
return localRepository;
}
public DefaultRepositoryRequest setLocalRepository( ArtifactRepository localRepository )
{
this.localRepository = localRepository;
return this;
}
public List<ArtifactRepository> getRemoteRepositories()
{
if ( remoteRepositories == null )
{
remoteRepositories = new ArrayList<ArtifactRepository>();
}
return remoteRepositories;
}
public DefaultRepositoryRequest setRemoteRepositories( List<ArtifactRepository> remoteRepositories )
{
this.remoteRepositories = remoteRepositories;
return this;
}
public RepositoryCache getCache()
{
return cache;
}
public DefaultRepositoryRequest setCache( RepositoryCache cache )
{
this.cache = cache;
return this;
}
}

53
maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java Normal file
View File

@ -0,0 +1,53 @@
package org.apache.maven.artifact.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* Caches auxiliary data used during repository access like already processed metadata. The data in the cache is meant
* for exclusive consumption by the repository system and is opaque to the cache implementation.
*
* @author Benjamin Bentmann
*/
public interface RepositoryCache
{
/**
* Puts the specified data into the cache. <strong>Warning:</strong> The cache will directly save the provided
* reference. If the cached data is mutable, i.e. could be modified after being put into the cache, the caller is
* responsible for creating a copy of the original data and store the copy in the cache.
*
* @param request The repository request from which this cache was retrieved, must not be {@code null}.
* @param key The key to use associate the data with, must not be {@code null}.
* @param data The data to store in the cache, may be {@code null}.
*/
void put( RepositoryRequest request, Object key, Object data );
/**
* Gets the specified data from the cache. <strong>Warning:</strong> The cache will directly return the saved
* reference. If the cached data is to be modified after its retrieval, the caller is responsible to create a copy
* of the returned data and use this instead of the cache record.
*
* @param request The repository request from which this cache was retrieved, must not be {@code null}.
* @param key The key to use for lookup of the data, must not be {@code null}.
* @return The requested data or {@code null} if none was present in the cache.
*/
Object get( RepositoryRequest request, Object key );
}

44
maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java Normal file
View File

@ -0,0 +1,44 @@
package org.apache.maven.artifact.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.util.List;
/**
* Collects basic settings to access the repository system.
*
* @author Benjamin Bentmann
*/
public interface RepositoryRequest
{
ArtifactRepository getLocalRepository();
RepositoryRequest setLocalRepository( ArtifactRepository localRepository );
List<ArtifactRepository> getRemoteRepositories();
RepositoryRequest setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
RepositoryCache getCache();
RepositoryRequest setCache( RepositoryCache cache );
}

5
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
View File

@ -82,6 +82,11 @@ public boolean isSnapshot()
return false;
}
public ArtifactRepository getRepository()
{
return artifact.getRepository();
}
public void setRepository( ArtifactRepository remoteRepository )
{
artifact.setRepository( remoteRepository );

180
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
View File

@ -20,12 +20,16 @@
import java.io.IOException;
import java.io.Reader;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.repository.legacy.UpdateCheckManager;
import org.apache.maven.repository.legacy.WagonManager;
@ -34,7 +38,6 @@
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@ -56,6 +59,53 @@ public class DefaultRepositoryMetadataManager
public void resolve( RepositoryMetadata metadata, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
throws RepositoryMetadataResolutionException
{
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
resolve( metadata, request );
}
public void resolve( RepositoryMetadata metadata, RepositoryRequest request )
throws RepositoryMetadataResolutionException
{
RepositoryCache cache = request.getCache();
CacheKey cacheKey = null;
if ( cache != null )
{
cacheKey = new CacheKey( metadata, request );
CacheRecord cacheRecord = (CacheRecord) cache.get( request, cacheKey );
if ( cacheRecord != null )
{
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Resolved metadata from cache: " + metadata );
}
metadata.setMetadata( MetadataUtils.cloneMetadata( cacheRecord.metadata ) );
if ( cacheRecord.repository != null )
{
for ( ArtifactRepository repository : request.getRemoteRepositories() )
{
if ( cacheRecord.repository.equals( repository.getId() ) )
{
metadata.setRepository( repository );
break;
}
}
}
return;
}
}
ArtifactRepository localRepository = request.getLocalRepository();
List<ArtifactRepository> remoteRepositories = request.getRemoteRepositories();
for ( ArtifactRepository repository : remoteRepositories )
{
ArtifactRepositoryPolicy policy = metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
@ -114,6 +164,133 @@ public void resolve( RepositoryMetadata metadata, List<ArtifactRepository> remot
{
throw new RepositoryMetadataResolutionException( "Unable to read local copy of metadata: " + e.getMessage(), e );
}
if ( cache != null )
{
cache.put( request, cacheKey, new CacheRecord( metadata ) );
}
}
private static final class CacheKey
{
final Object metadataKey;
final ArtifactRepository localRepository;
final List<ArtifactRepository> remoteRepositories;
final int hashCode;
CacheKey( RepositoryMetadata metadata, RepositoryRequest request )
{
metadataKey = metadata.getKey();
localRepository = request.getLocalRepository();
remoteRepositories = request.getRemoteRepositories();
int hash = 17;
hash = hash * 31 + metadata.getKey().hashCode();
hash = hash * 31 + repoHashCode( localRepository );
for ( ArtifactRepository remoteRepository : remoteRepositories )
{
hash = hash * 31 + repoHashCode( remoteRepository );
}
hashCode = hash;
}
int repoHashCode( ArtifactRepository repository )
{
return ( repository != null && repository.getUrl() != null ) ? repository.getUrl().hashCode() : 0;
}
boolean repoEquals( ArtifactRepository repo1, ArtifactRepository repo2 )
{
if ( repo1 == repo2 )
{
return true;
}
if ( repo1 == null || repo2 == null )
{
return false;
}
return equal( repo1.getUrl(), repo2.getUrl() ) && repo1.getClass() == repo2.getClass();
}
private static <T> boolean equal( T s1, T s2 )
{
return s1 != null ? s1.equals( s2 ) : s2 == null;
}
@Override
public boolean equals( Object obj )
{
if ( this == obj )
{
return true;
}
if ( !( obj instanceof CacheKey ) )
{
return false;
}
CacheKey that = (CacheKey) obj;
if ( !this.metadataKey.equals( that.metadataKey ) )
{
return false;
}
if ( !repoEquals( this.localRepository, that.localRepository ) )
{
return false;
}
for ( Iterator<ArtifactRepository> it1 = this.remoteRepositories.iterator(), it2 =
that.remoteRepositories.iterator();; )
{
if ( !it1.hasNext() || !it2.hasNext() )
{
if ( it1.hasNext() != it2.hasNext() )
{
return false;
}
break;
}
ArtifactRepository repo1 = it1.next();
ArtifactRepository repo2 = it2.next();
if ( !repoEquals( repo1, repo2 ) )
{
return false;
}
}
return true;
}
@Override
public int hashCode()
{
return hashCode;
}
}
private static final class CacheRecord
{
final Metadata metadata;
final String repository;
CacheRecord( RepositoryMetadata metadata )
{
this.metadata = MetadataUtils.cloneMetadata( metadata.getMetadata() );
this.repository = ( metadata.getRepository() != null ) ? metadata.getRepository().getId() : null;
}
}
private void mergeMetadata( RepositoryMetadata metadata, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
@ -355,4 +532,5 @@ public void install( ArtifactMetadata metadata, ArtifactRepository localReposito
throw new RepositoryMetadataInstallationException( "Error installing metadata: " + e.getMessage(), e );
}
}
}

5
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
View File

@ -108,6 +108,11 @@ public boolean isSnapshot()
return false;
}
public ArtifactRepository getRepository()
{
return null;
}
public void setRepository( ArtifactRepository remoteRepository )
{
// intentionally blank

106
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java Normal file
View File

@ -0,0 +1,106 @@
package org.apache.maven.artifact.repository.metadata;
import java.util.ArrayList;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* Assists in handling repository metadata.
*
* @author Benjamin Bentmann
*/
class MetadataUtils
{
// TODO: Kill this class once MODELLO-191 is released
public static Metadata cloneMetadata( Metadata src )
{
if ( src == null )
{
return null;
}
Metadata target = new Metadata();
target.setGroupId( src.getGroupId() );
target.setArtifactId( src.getArtifactId() );
target.setVersion( src.getVersion() );
target.setVersioning( cloneVersioning( src.getVersioning() ) );
for ( Plugin plugin : src.getPlugins() )
{
target.addPlugin( clonePlugin( plugin ) );
}
return target;
}
public static Plugin clonePlugin( Plugin src )
{
if ( src == null )
{
return null;
}
Plugin target = new Plugin();
target.setArtifactId( src.getArtifactId() );
target.setName( src.getName() );
target.setPrefix( src.getPrefix() );
return target;
}
public static Versioning cloneVersioning( Versioning src )
{
if ( src == null )
{
return null;
}
Versioning target = new Versioning();
target.setLastUpdated( src.getLastUpdated() );
target.setLatest( src.getLatest() );
target.setRelease( src.getRelease() );
target.setSnapshot( cloneSnapshot( src.getSnapshot() ) );
target.setVersions( new ArrayList<String>( src.getVersions() ) );
return target;
}
public static Snapshot cloneSnapshot( Snapshot src )
{
if ( src == null )
{
return null;
}
Snapshot target = new Snapshot();
target.setBuildNumber( src.getBuildNumber() );
target.setLocalCopy( src.isLocalCopy() );
target.setTimestamp( src.getTimestamp() );
return target;
}
}

7
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
View File

@ -32,6 +32,13 @@
public interface RepositoryMetadata
extends org.apache.maven.artifact.metadata.ArtifactMetadata
{
/**
* Get the repository the metadata was located in.
*
* @return the repository
*/
ArtifactRepository getRepository();
/**
* Set the repository the metadata was located in.
*

5
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
View File

@ -23,9 +23,14 @@
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
public interface RepositoryMetadataManager
{
void resolve( RepositoryMetadata repositoryMetadata, RepositoryRequest repositoryRequest )
throws RepositoryMetadataResolutionException;
void resolve( RepositoryMetadata repositoryMetadata, List<ArtifactRepository> repositories, ArtifactRepository localRepository )
throws RepositoryMetadataResolutionException;

5
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
View File

@ -82,6 +82,11 @@ public boolean isSnapshot()
return artifact.isSnapshot();
}
public ArtifactRepository getRepository()
{
return artifact.getRepository();
}
public void setRepository( ArtifactRepository remoteRepository )
{
artifact.setRepository( remoteRepository );

32
maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
View File

@ -26,6 +26,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.wagon.events.TransferListener;
@ -36,7 +38,9 @@
* @author Jason van Zyl
*/
public class ArtifactResolutionRequest
implements RepositoryRequest
{
private Artifact artifact;
// Needs to go away
@ -48,6 +52,8 @@ public class ArtifactResolutionRequest
private List<ArtifactRepository> remoteRepositories;
private RepositoryCache cache;
private ArtifactFilter filter;
// Needs to go away
@ -61,12 +67,19 @@ public class ArtifactResolutionRequest
private boolean resolveRoot = true;
private boolean resolveTransitively = false;
public ArtifactResolutionRequest( )
public ArtifactResolutionRequest()
{
// nothing here
}
public ArtifactResolutionRequest( RepositoryRequest request )
{
setLocalRepository( request.getLocalRepository() );
setRemoteRepositories( request.getRemoteRepositories() );
setCache( request.getCache() );
}
public Artifact getArtifact()
{
return artifact;
@ -204,4 +217,17 @@ public String toString()
return sb.toString();
}
public RepositoryCache getCache()
{
return cache;
}
public ArtifactResolutionRequest setCache( RepositoryCache cache )
{
this.cache = cache;
return this;
}
}

34
maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
View File

@ -31,6 +31,8 @@
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.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.Snapshot;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
@ -86,16 +88,22 @@ public class DefaultArtifactResolver
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, TransferListener resolutionListener )
throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, localRepository, resolutionListener, false );
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
resolve( artifact, request, resolutionListener, false );
}
public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, localRepository, null, true );
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
resolve( artifact, request, null, true );
}
private void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, TransferListener downloadMonitor, boolean force )
private void resolve( Artifact artifact, RepositoryRequest request, TransferListener downloadMonitor, boolean force )
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( artifact == null )
@ -128,7 +136,11 @@ private void resolve( Artifact artifact, List<ArtifactRepository> remoteReposito
return;
}
ArtifactRepository localRepository = request.getLocalRepository();
List<ArtifactRepository> remoteRepositories = request.getRemoteRepositories();
if ( !artifact.isResolved() )
{
// ----------------------------------------------------------------------
@ -144,7 +156,7 @@ private void resolve( Artifact artifact, List<ArtifactRepository> remoteReposito
return;
}
transformationManager.transformForResolve( artifact, remoteRepositories, localRepository );
transformationManager.transformForResolve( artifact, request );
boolean localCopy = isLocalCopy( artifact );
@ -358,8 +370,6 @@ private ArtifactResolutionResult resolve( ArtifactResolutionRequest request, boo
Artifact rootArtifact = request.getArtifact();
Set<Artifact> artifacts = request.getArtifactDependencies();
Map managedVersions = request.getManagedVersionMap();
ArtifactRepository localRepository = request.getLocalRepository();
List<ArtifactRepository> remoteRepositories = request.getRemoteRepositories();
List<ResolutionListener> listeners = request.getListeners();
ArtifactFilter filter = request.getFilter();
@ -399,7 +409,7 @@ private ArtifactResolutionResult resolve( ArtifactResolutionRequest request, boo
{
try
{
resolve( rootArtifact, remoteRepositories, localRepository );
resolve( rootArtifact, request, request.getTransferListener(), false );
}
catch ( ArtifactResolutionException e )
{
@ -415,11 +425,9 @@ private ArtifactResolutionResult resolve( ArtifactResolutionRequest request, boo
if ( request.isResolveTransitively() )
{
MetadataResolutionRequest metadataRequest = new DefaultMetadataResolutionRequest();
MetadataResolutionRequest metadataRequest = new DefaultMetadataResolutionRequest( request );
metadataRequest.setArtifact( rootArtifact );
metadataRequest.setLocalRepository( localRepository );
metadataRequest.setRemoteRepositories( remoteRepositories );
metadataRequest.setResolveManagedVersions( managedVersions == null );
try
@ -473,7 +481,7 @@ private ArtifactResolutionResult resolve( ArtifactResolutionRequest request, boo
}
// After the collection we will have the artifact object in the result but they will not be resolved yet.
result = artifactCollector.collect( artifacts, rootArtifact, managedVersions, localRepository, remoteRepositories, source, filter, listeners, null );
result = artifactCollector.collect( artifacts, rootArtifact, managedVersions, request, source, filter, listeners, null );
// We have metadata retrieval problems, or there are cycles that have been detected
// so we give this back to the calling code and let them deal with this information
@ -490,7 +498,7 @@ private ArtifactResolutionResult resolve( ArtifactResolutionRequest request, boo
{
try
{
resolve( artifact, remoteRepositories, localRepository, request.getTransferListener() );
resolve( artifact, request, request.getTransferListener(), false );
}
catch ( ArtifactNotFoundException anfe )
{

28
maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
View File

@ -23,6 +23,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.artifact.repository.RepositoryRequest;
/**
* Forms a request to retrieve artifact metadata.
@ -39,8 +41,22 @@ public class DefaultMetadataResolutionRequest
private List<ArtifactRepository> remoteRepositories;
private RepositoryCache cache;
private boolean resolveManagedVersions;
public DefaultMetadataResolutionRequest()
{
// does nothing
}
public DefaultMetadataResolutionRequest( RepositoryRequest request )
{
setLocalRepository( request.getLocalRepository() );
setRemoteRepositories( request.getRemoteRepositories() );
setCache( request.getCache() );
}
public Artifact getArtifact()
{
return artifact;
@ -88,4 +104,16 @@ public MetadataResolutionRequest setResolveManagedVersions( boolean resolveManag
return this;
}
public RepositoryCache getCache()
{
return cache;
}
public MetadataResolutionRequest setCache( RepositoryCache cache )
{
this.cache = cache;
return this;
}
}

2
maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
View File

@ -23,6 +23,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
/**
* Forms a request to retrieve artifact metadata.
@ -30,6 +31,7 @@
* @author Benjamin Bentmann
*/
public interface MetadataResolutionRequest
extends RepositoryRequest
{
/**

50
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
View File

@ -32,6 +32,8 @@
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.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.CyclicDependencyException;
@ -45,6 +47,8 @@
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.repository.legacy.metadata.DefaultMetadataResolutionRequest;
import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@ -73,6 +77,22 @@ public ArtifactResolutionResult collect( Set<Artifact> artifacts,
ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
{
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
return collect( artifacts, originatingArtifact, managedVersions, request, source, filter, listeners,
conflictResolvers );
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
RepositoryRequest repositoryRequest,
ArtifactMetadataSource source,
ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
{
ArtifactResolutionResult result = new ArtifactResolutionResult();
@ -85,11 +105,11 @@ public ArtifactResolutionResult collect( Set<Artifact> artifacts,
Map<Object, List<ResolutionNode>> resolvedArtifacts = new LinkedHashMap<Object, List<ResolutionNode>>();
ResolutionNode root = new ResolutionNode( originatingArtifact, remoteRepositories );
ResolutionNode root = new ResolutionNode( originatingArtifact, repositoryRequest.getRemoteRepositories() );
try
{
root.addDependencies( artifacts, remoteRepositories, filter );
root.addDependencies( artifacts, repositoryRequest.getRemoteRepositories(), filter );
}
catch ( CyclicDependencyException e )
{
@ -108,7 +128,7 @@ public ArtifactResolutionResult collect( Set<Artifact> artifacts,
try
{
recurse( result, root, resolvedArtifacts, versionMap, localRepository, remoteRepositories, source, filter, listeners, conflictResolvers );
recurse( result, root, resolvedArtifacts, versionMap, repositoryRequest, source, filter, listeners, conflictResolvers );
}
catch ( CyclicDependencyException e )
{
@ -205,8 +225,7 @@ private void recurse( ArtifactResolutionResult result,
ResolutionNode node,
Map<Object, List<ResolutionNode>> resolvedArtifacts,
ManagedVersionMap managedVersions,
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
RepositoryRequest request,
ArtifactMetadataSource source,
ArtifactFilter filter,
List<ResolutionListener> listeners,
@ -275,13 +294,16 @@ private void recurse( ArtifactResolutionResult result,
{
try
{
versions = source.retrieveAvailableVersions( resetArtifact, localRepository, remoteRepositories );
MetadataResolutionRequest metadataRequest =
new DefaultMetadataResolutionRequest( request );
metadataRequest.setArtifact( resetArtifact );
versions = source.retrieveAvailableVersions( metadataRequest );
resetArtifact.setAvailableVersions( versions );
}
catch ( ArtifactMetadataRetrievalException e )
{
resetArtifact.setDependencyTrail( node.getDependencyTrail() );
throw new ArtifactResolutionException( "Unable to get dependency information: " + e.getMessage(), resetArtifact, remoteRepositories, e );
throw new ArtifactResolutionException( "Unable to get dependency information: " + e.getMessage(), resetArtifact, request.getRemoteRepositories(), e );
}
}
// end hack
@ -398,6 +420,11 @@ private void recurse( ArtifactResolutionResult result,
artifact.setDependencyTrail( node.getDependencyTrail() );
List<ArtifactRepository> childRemoteRepositories = child.getRemoteRepositories();
MetadataResolutionRequest metadataRequest =
new DefaultMetadataResolutionRequest( request );
metadataRequest.setArtifact( artifact );
metadataRequest.setRemoteRepositories( childRemoteRepositories );
try
{
ResolutionGroup rGroup;
@ -449,7 +476,7 @@ private void recurse( ArtifactResolutionResult result,
List<ArtifactVersion> versions = artifact.getAvailableVersions();
if ( versions == null )
{
versions = source.retrieveAvailableVersions( artifact, localRepository, childRemoteRepositories );
versions = source.retrieveAvailableVersions( metadataRequest );
artifact.setAvailableVersions( versions );
}
@ -483,7 +510,7 @@ private void recurse( ArtifactResolutionResult result,
fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}
rGroup = source.retrieve( artifact, localRepository, childRemoteRepositories );
rGroup = source.retrieve( metadataRequest );
if ( rGroup == null )
{
@ -496,6 +523,7 @@ private void recurse( ArtifactResolutionResult result,
relocated.setDependencyFilter( artifact.getDependencyFilter() );
artifact = relocated;
child.setArtifact( artifact );
metadataRequest.setArtifact( artifact );
}
}
while( !childKey.equals( child.getKey() ) );
@ -539,8 +567,8 @@ private void recurse( ArtifactResolutionResult result,
+ e.getMessage(), artifact, childRemoteRepositories, e );
}
recurse( result, child, resolvedArtifacts, managedVersions, localRepository,
childRemoteRepositories, source, filter, listeners, conflictResolvers );
recurse( result, child, resolvedArtifacts, managedVersions, metadataRequest, source, filter,
listeners, conflictResolvers );
}
}
catch ( OverConstrainedVersionException e )

10
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
View File

@ -26,6 +26,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
@ -42,6 +43,15 @@
public interface LegacyArtifactCollector
{
ArtifactResolutionResult collect( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,
RepositoryRequest repositoryRequest,
ArtifactMetadataSource source,
ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers );
ArtifactResolutionResult collect( Set<Artifact> artifacts,
Artifact originatingArtifact,
Map managedVersions,

24
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
View File

@ -23,6 +23,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
@ -30,6 +32,8 @@
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.repository.legacy.WagonManager;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@ -51,7 +55,23 @@ public abstract class AbstractVersionTransformation
@Requirement
protected WagonManager wagonManager;
protected String resolveVersion( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public void transformForResolve( Artifact artifact, RepositoryRequest request )
throws ArtifactResolutionException, ArtifactNotFoundException
{
transformForResolve( artifact, request.getRemoteRepositories(), request.getLocalRepository() );
}
protected String resolveVersion( Artifact artifact, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
throws RepositoryMetadataResolutionException
{
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
return resolveVersion( artifact, request );
}
protected String resolveVersion( Artifact artifact, RepositoryRequest request )
throws RepositoryMetadataResolutionException
{
RepositoryMetadata metadata;
@ -65,7 +85,7 @@ protected String resolveVersion( Artifact artifact, ArtifactRepository localRepo
metadata = new SnapshotArtifactRepositoryMetadata( artifact );
}
repositoryMetadataManager.resolve( metadata, remoteRepositories, localRepository );
repositoryMetadataManager.resolve( metadata, request );
artifact.addMetadata( metadata );

12
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
View File

@ -25,6 +25,7 @@
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@ -37,6 +38,17 @@ public interface ArtifactTransformation
{
String ROLE = ArtifactTransformation.class.getName();
/**
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.
*
* @param artifact Artifact to be transformed.
* @param request the repositories to check
* @param localRepository the local repository
*/
void transformForResolve( Artifact artifact, RepositoryRequest request )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.

12
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
View File

@ -25,6 +25,7 @@
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@ -33,6 +34,17 @@ public interface ArtifactTransformationManager
{
String ROLE = ArtifactTransformationManager.class.getName();
/**
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.
*
* @param artifact Artifact to be transformed.
* @param request the repositories to check
* @param localRepository the local repository
*/
void transformForResolve( Artifact artifact, RepositoryRequest request )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.

10
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
View File

@ -25,6 +25,7 @@
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.codehaus.plexus.component.annotations.Component;
@ -40,6 +41,15 @@ public class DefaultArtifactTransformationManager
@Requirement(role=ArtifactTransformation.class, hints={"release", "latest", "snapshot"})
private List<ArtifactTransformation> artifactTransformations;
public void transformForResolve( Artifact artifact, RepositoryRequest request )
throws ArtifactResolutionException, ArtifactNotFoundException
{
for ( ArtifactTransformation transform : artifactTransformations )
{
transform.transformForResolve( artifact, request );
}
}
public void transformForResolve( Artifact artifact,
List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )

19
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
View File

@ -28,12 +28,15 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.artifact.repository.metadata.Snapshot;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
@ -53,8 +56,17 @@ public class SnapshotTransformation
private static final String UTC_TIMESTAMP_PATTERN = "yyyyMMdd.HHmmss";
public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
transformForResolve( artifact, request );
}
public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
public void transformForResolve( Artifact artifact, RepositoryRequest request )
throws ArtifactResolutionException
{
// Only select snapshots that are unresolved (eg 1.0-SNAPSHOT, not 1.0-20050607.123456)
@ -62,8 +74,8 @@ public void transformForResolve( Artifact artifact, List<ArtifactRepository> rem
{
try
{
String version = resolveVersion( artifact, localRepository, remoteRepositories );
artifact.updateVersion( version, localRepository );
String version = resolveVersion( artifact, request );
artifact.updateVersion( version, request.getLocalRepository() );
}
catch ( RepositoryMetadataResolutionException e )
{
@ -173,4 +185,5 @@ public static DateFormat getUtcDateFormatter()
utcDateFormatter.setTimeZone( UTC_TIME_ZONE );
return utcDateFormatter;
}
}

6
maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
View File

@ -75,4 +75,10 @@ public ResolutionGroup retrieve( MetadataResolutionRequest request )
return retrieve( request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories() );
}
public List<ArtifactVersion> retrieveAvailableVersions( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException
{
return retrieveAvailableVersions( request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories() );
}
}

6
maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
View File

@ -222,6 +222,12 @@ public ResolutionGroup retrieve( MetadataResolutionRequest request )
{
return retrieve( request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories() );
}
public List<ArtifactVersion> retrieveAvailableVersions( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException
{
return retrieveAvailableVersions( request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories() );
}
};
ArtifactResolutionResult result = null;

6
maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
View File

@ -974,5 +974,11 @@ public ResolutionGroup retrieve( MetadataResolutionRequest request )
{
return retrieve( request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories() );
}
public List<ArtifactVersion> retrieveAvailableVersions( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException
{
return retrieveAvailableVersions( request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories() );
}
}
}

9
maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
View File

@ -1,11 +1,10 @@
package org.apache.maven;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
@ -30,7 +29,7 @@ public class DefaultProjectDependenciesResolver
@Requirement
private ResolutionErrorHandler resolutionErrorHandler;
public Set<Artifact> resolve( MavenProject project, Collection<String> scopes, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public Set<Artifact> resolve( MavenProject project, Collection<String> scopes, RepositoryRequest repositoryRequest )
throws ArtifactResolutionException, ArtifactNotFoundException
{
/*
@ -73,12 +72,10 @@ public Set<Artifact> resolve( MavenProject project, Collection<String> scopes, A
ArtifactFilter filter = scopeFilter;
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
ArtifactResolutionRequest request = new ArtifactResolutionRequest( repositoryRequest )
.setArtifact( new ProjectArtifact( project ) )
.setResolveRoot( false )
.setResolveTransitively( true )
.setLocalRepository( localRepository )
.setRemoteRepositories( remoteRepositories )
.setManagedVersionMap( project.getManagedVersionMap() )
.setFilter( filter );
// FIXME setTransferListener

5
maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
View File

@ -1,17 +1,16 @@
package org.apache.maven;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.project.MavenProject;
public interface ProjectDependenciesResolver
{
public Set<Artifact> resolve( MavenProject project, Collection<String> scopes, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public Set<Artifact> resolve( MavenProject project, Collection<String> scopes, RepositoryRequest repositoryRequest )
throws ArtifactResolutionException, ArtifactNotFoundException;
}

17
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -22,6 +22,7 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
@ -35,6 +36,8 @@ public class DefaultMavenExecutionRequest
implements MavenExecutionRequest
{
private RepositoryCache repositoryCache = new SessionRepositoryCache();
private ArtifactRepository localRepository;
private File localRepositoryPath;
@ -156,6 +159,7 @@ public static MavenExecutionRequest copy( MavenExecutionRequest original )
copy.setUpdateSnapshots( original.isUpdateSnapshots() );
copy.setRemoteRepositories( original.getRemoteRepositories() );
copy.setPluginArtifactRepositories( original.getPluginArtifactRepositories() );
copy.setRepositoryCache( original.getRepositoryCache() );
copy.setNoSnapshotUpdates( original.isNoSnapshotUpdates() );
return original;
}
@ -893,6 +897,7 @@ public ProjectBuildingRequest getProjectBuildingRequest()
projectBuildingRequest.setUserProperties( getUserProperties() );
projectBuildingRequest.setRemoteRepositories( getRemoteRepositories() );
projectBuildingRequest.setPluginArtifactRepositories( getPluginArtifactRepositories() );
projectBuildingRequest.setRepositoryCache( getRepositoryCache() );
projectBuildingRequest.setActiveProfileIds( getActiveProfiles() );
projectBuildingRequest.setInactiveProfileIds( getInactiveProfiles() );
projectBuildingRequest.setProfiles( getProfiles() );
@ -923,4 +928,16 @@ public MavenExecutionRequest addProfile( Profile profile )
return this;
}
public RepositoryCache getRepositoryCache()
{
return repositoryCache;
}
public MavenExecutionRequest setRepositoryCache( RepositoryCache repositoryCache )
{
this.repositoryCache = repositoryCache;
return this;
}
}

4
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
View File

@ -26,6 +26,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.model.Profile;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.settings.Settings;
@ -256,6 +257,9 @@ public interface MavenExecutionRequest
MavenExecutionRequest setPluginArtifactRepositories( List<ArtifactRepository> repositories );
List<ArtifactRepository> getPluginArtifactRepositories();
MavenExecutionRequest setRepositoryCache( RepositoryCache repositoryCache );
RepositoryCache getRepositoryCache();
File getUserToolchainsFile();
MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );

6
maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
View File

@ -28,6 +28,7 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
@ -101,6 +102,11 @@ public PlexusContainer getContainer()
return container;
}
public RepositoryCache getRepositoryCache()
{
return request.getRepositoryCache();
}
public ArtifactRepository getLocalRepository()
{
return request.getLocalRepository();

49
maven-core/src/main/java/org/apache/maven/execution/SessionRepositoryCache.java Normal file
View File

@ -0,0 +1,49 @@
package org.apache.maven.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.util.HashMap;
import java.util.Map;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.artifact.repository.RepositoryRequest;
/**
* Provides a simple repository cache whose lifetime is scoped to a single Maven session.
*
* @author Benjamin Bentmann
*/
class SessionRepositoryCache
implements RepositoryCache
{
private Map<Object, Object> cache = new HashMap<Object, Object>( 256 );
public Object get( RepositoryRequest request, Object key )
{
return cache.get( key );
}
public void put( RepositoryRequest request, Object key, Object data )
{
cache.put( key, data );
}
}

64
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -32,6 +32,8 @@
import org.apache.maven.ProjectDependenciesResolver;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataReadException;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
@ -154,6 +156,10 @@ public void execute( MavenSession session )
MavenExecutionResult result = session.getResult();
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setLocalRepository( session.getLocalRepository() );
repositoryRequest.setCache( session.getRepositoryCache() );
for ( MavenProject currentProject : session.getProjects() )
{
if ( session.isBlackListed( currentProject ) )
@ -185,7 +191,8 @@ public void execute( MavenSession session )
// the project dependencies. Having it happen in the plugin manager is a tangled mess. We can optimize this
// later by looking at the build plan. Would be better to just batch download everything required by the reactor.
projectDependenciesResolver.resolve( currentProject, executionPlan.getRequiredResolutionScopes(), session.getLocalRepository(), currentProject.getRemoteArtifactRepositories() );
repositoryRequest.setRemoteRepositories( currentProject.getRemoteArtifactRepositories() );
projectDependenciesResolver.resolve( currentProject, executionPlan.getRequiredResolutionScopes(), repositoryRequest );
if ( logger.isDebugEnabled() )
{
@ -330,8 +337,7 @@ public MavenExecutionPlan calculateExecutionPlan( MavenSession session, String..
{
mojoDescriptor =
pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(),
session.getLocalRepository(),
project.getPluginArtifactRepositories() );
getRepositoryRequest( session, project ) );
mojoExecution.setMojoDescriptor( mojoDescriptor );
}
@ -354,6 +360,16 @@ public MavenExecutionPlan calculateExecutionPlan( MavenSession session, String..
return new MavenExecutionPlan( lifecyclePlan, requiredDependencyResolutionScopes );
}
private RepositoryRequest getRepositoryRequest( MavenSession session, MavenProject project )
{
RepositoryRequest request = new DefaultRepositoryRequest();
request.setCache( session.getRepositoryCache() );
request.setLocalRepository( session.getLocalRepository() );
request.setRemoteRepositories( project.getPluginArtifactRepositories() );
return request;
}
private void collectDependencyResolutionScopes( Collection<String> requiredDependencyResolutionScopes,
MojoExecution mojoExecution )
@ -511,8 +527,7 @@ private Map<String, List<MojoExecution>> calculateLifecycleMappings( MavenSessio
for ( String goal : execution.getGoals() )
{
MojoDescriptor mojoDescriptor =
pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(),
project.getPluginArtifactRepositories() );
pluginManager.getMojoDescriptor( plugin, goal, getRepositoryRequest( session, project ) );
List<MojoExecution> mojoExecutions = lifecycleMappings.get( mojoDescriptor.getPhase() );
if ( mojoExecutions != null )
@ -557,8 +572,7 @@ private void calculateForkedExecutions( MojoExecution mojoExecution, MavenSessio
{
MojoDescriptor forkedMojoDescriptor =
pluginManager.getMojoDescriptor( forkedExecution.getPlugin(), forkedExecution.getGoal(),
session.getLocalRepository(),
project.getPluginArtifactRepositories() );
getRepositoryRequest( session, project ) );
forkedExecution.setMojoDescriptor( forkedMojoDescriptor );
}
@ -875,20 +889,24 @@ else if ( numTokens == 2 )
injectPluginDeclarationFromProject( plugin, project );
RepositoryRequest repositoryRequest = getRepositoryRequest( session, project );
// If there is no version to be found then we need to look in the repository metadata for
// this plugin and see what's specified as the latest release.
//
if ( plugin.getVersion() == null )
{
resolvePluginVersion( plugin, session.getLocalRepository(), project.getPluginArtifactRepositories() );
resolvePluginVersion( plugin, repositoryRequest );
}
return pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), project.getPluginArtifactRepositories() );
return pluginManager.getMojoDescriptor( plugin, goal, repositoryRequest );
}
private void resolvePluginVersion( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
private void resolvePluginVersion( Plugin plugin, RepositoryRequest repositoryRequest )
throws PluginNotFoundException
{
ArtifactRepository localRepository = repositoryRequest.getLocalRepository();
File artifactMetadataFile = null;
String localPath;
@ -899,7 +917,7 @@ private void resolvePluginVersion( Plugin plugin, ArtifactRepository localReposi
//
//TODO: we should cycle through the repositories but take the repository which actually
// satisfied the prefix.
for ( ArtifactRepository repository : remoteRepositories )
for ( ArtifactRepository repository : repositoryRequest.getRemoteRepositories() )
{
localPath = plugin.getGroupId().replace( '.', '/' ) + "/" + plugin.getArtifactId() + "/maven-metadata-" + repository.getId() + ".xml";
@ -974,7 +992,7 @@ private void resolvePluginVersion( Plugin plugin, ArtifactRepository localReposi
if ( StringUtils.isEmpty( plugin.getVersion() ) )
{
throw new PluginNotFoundException( plugin, remoteRepositories );
throw new PluginNotFoundException( plugin, repositoryRequest.getRemoteRepositories() );
}
}
@ -1125,14 +1143,14 @@ private void parseLifecyclePhaseDefinitions( Map<Plugin, Plugin> plugins, String
}
}
private void populateDefaultConfigurationForPlugin( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
private void populateDefaultConfigurationForPlugin( Plugin plugin, RepositoryRequest repositoryRequest )
throws LifecycleExecutionException
{
if ( plugin.getVersion() == null )
{
try
{
resolvePluginVersion( plugin, localRepository, remoteRepositories );
resolvePluginVersion( plugin, repositoryRequest );
}
catch ( PluginNotFoundException e )
{
@ -1144,29 +1162,29 @@ private void populateDefaultConfigurationForPlugin( Plugin plugin, ArtifactRepos
{
for( String goal : pluginExecution.getGoals() )
{
Xpp3Dom dom = getDefaultPluginConfiguration( plugin, goal, localRepository, remoteRepositories );
Xpp3Dom dom = getDefaultPluginConfiguration( plugin, goal, repositoryRequest );
pluginExecution.setConfiguration( Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) pluginExecution.getConfiguration(), dom, Boolean.TRUE ) );
}
}
}
public void populateDefaultConfigurationForPlugins( Collection<Plugin> plugins, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public void populateDefaultConfigurationForPlugins( Collection<Plugin> plugins, RepositoryRequest repositoryRequest )
throws LifecycleExecutionException
{
for( Plugin plugin : plugins )
{
populateDefaultConfigurationForPlugin( plugin, localRepository, remoteRepositories );
populateDefaultConfigurationForPlugin( plugin, repositoryRequest );
}
}
private Xpp3Dom getDefaultPluginConfiguration( Plugin plugin, String goal, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
private Xpp3Dom getDefaultPluginConfiguration( Plugin plugin, String goal, RepositoryRequest repositoryRequest )
throws LifecycleExecutionException
{
MojoDescriptor mojoDescriptor;
try
{
mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, localRepository, remoteRepositories );
mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, repositoryRequest );
}
catch ( PluginNotFoundException e )
{
@ -1252,13 +1270,13 @@ public Plugin findPluginForPrefix( String prefix, MavenSession session )
if ( project != null )
{
RepositoryRequest repositoryRequest = getRepositoryRequest( session, project );
for ( Plugin buildPlugin : project.getBuildPlugins() )
{
try
{
PluginDescriptor pluginDescriptor =
pluginManager.loadPlugin( buildPlugin, session.getLocalRepository(),
project.getPluginArtifactRepositories() );
PluginDescriptor pluginDescriptor = pluginManager.loadPlugin( buildPlugin, repositoryRequest );
if ( prefix.equals( pluginDescriptor.getGoalPrefix() ) )
{

3
maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
View File

@ -24,6 +24,7 @@
import java.util.Set;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.CycleDetectedInPluginGraphException;
@ -72,7 +73,7 @@ MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks
// Given a set of {@link org.apache.maven.Plugin} objects where the GAV is set we can lookup the plugin
// descriptor and populate the default configuration.
//
void populateDefaultConfigurationForPlugins( Collection<Plugin> plugins, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
void populateDefaultConfigurationForPlugins( Collection<Plugin> plugins, RepositoryRequest repositoryRequest )
throws LifecycleExecutionException;
void execute( MavenSession session );

39
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -34,6 +34,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
@ -106,8 +108,7 @@ public class DefaultPluginManager
/**
*
* @param plugin
* @param localRepository
* @param remoteRepositories
* @param repositoryRequest
* @return PluginDescriptor The component descriptor for the Maven plugin.
* @throws PluginNotFoundException The plugin could not be found in any repositories.
* @throws PluginResolutionException The plugin could be found but could not be resolved.
@ -116,10 +117,12 @@ public class DefaultPluginManager
* happen but if someone has made a descriptor by hand it's possible.
* @throws CycleDetectedInComponentGraphException A cycle has been detected in the component graph for a plugin that has been dynamically loaded.
*/
public synchronized PluginDescriptor loadPlugin( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public synchronized PluginDescriptor loadPlugin( Plugin plugin, RepositoryRequest repositoryRequest )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, InvalidPluginDescriptorException
{
PluginDescriptor pluginDescriptor = pluginCache.getPluginDescriptor( plugin, localRepository, remoteRepositories );
PluginDescriptor pluginDescriptor =
pluginCache.getPluginDescriptor( plugin, repositoryRequest.getLocalRepository(),
repositoryRequest.getRemoteRepositories() );
if ( pluginDescriptor != null )
{
@ -128,10 +131,8 @@ public synchronized PluginDescriptor loadPlugin( Plugin plugin, ArtifactReposito
Artifact pluginArtifact = repositorySystem.createPluginArtifact( plugin );
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
ArtifactResolutionRequest request = new ArtifactResolutionRequest( repositoryRequest )
.setArtifact( pluginArtifact )
.setLocalRepository( localRepository )
.setRemoteRepositories( remoteRepositories )
.setResolveTransitively( false );
// FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );
@ -207,7 +208,8 @@ public synchronized PluginDescriptor loadPlugin( Plugin plugin, ArtifactReposito
pluginDescriptor.setPlugin( plugin );
pluginDescriptor.setPluginArtifact( pluginArtifact );
pluginCache.putPluginDescriptor( plugin, localRepository, remoteRepositories, pluginDescriptor );
pluginCache.putPluginDescriptor( plugin, repositoryRequest.getLocalRepository(),
repositoryRequest.getRemoteRepositories(), pluginDescriptor );
return pluginDescriptor;
@ -242,7 +244,7 @@ public PluginDescriptor parsebuildPluginDescriptor( InputStream is )
* no file set is meant to be excluded from the plugin realm in favor of the equivalent library from the current
* core distro.
*/
List<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin pluginAsSpecifiedInPom, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
List<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin pluginAsSpecifiedInPom, RepositoryRequest repositoryRequest )
throws ArtifactNotFoundException, ArtifactResolutionException
{
ArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME_PLUS_SYSTEM );
@ -269,12 +271,10 @@ List<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin pluginAsSpeci
dependenciesToResolveForPlugin.add( a );
}
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
ArtifactResolutionRequest request = new ArtifactResolutionRequest( repositoryRequest )
.setArtifact( pluginArtifact )
// So this in fact are overrides ...
.setArtifactDependencies( dependenciesToResolveForPlugin )
.setLocalRepository( localRepository )
.setRemoteRepositories( remoteRepositories )
.setFilter( filter )
.setResolveRoot( true )
.setResolveTransitively( true );
@ -396,6 +396,7 @@ public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescr
}
Plugin plugin = pluginDescriptor.getPlugin();
ArtifactRepository localRepository = session.getLocalRepository();
List<ArtifactRepository> remoteRepositories = session.getCurrentProject().getPluginArtifactRepositories();
@ -417,7 +418,11 @@ public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescr
try
{
pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin, localRepository, remoteRepositories );
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
request.setCache( session.getRepositoryCache() );
pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin, request );
}
catch ( ArtifactNotFoundException e )
{
@ -686,7 +691,7 @@ private void populatePluginFields( Mojo mojo, MojoDescriptor mojoDescriptor, Cla
}
}
public MojoDescriptor getMojoDescriptor( String groupId, String artifactId, String version, String goal, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public MojoDescriptor getMojoDescriptor( String groupId, String artifactId, String version, String goal, RepositoryRequest repositoryRequest )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, MojoNotFoundException, InvalidPluginDescriptorException
{
Plugin plugin = new Plugin();
@ -694,13 +699,13 @@ public MojoDescriptor getMojoDescriptor( String groupId, String artifactId, Stri
plugin.setArtifactId( artifactId );
plugin.setVersion( version );
return getMojoDescriptor( plugin, goal, localRepository, remoteRepositories );
return getMojoDescriptor( plugin, goal, repositoryRequest );
}
public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, RepositoryRequest repositoryRequest )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, MojoNotFoundException, InvalidPluginDescriptorException
{
PluginDescriptor pluginDescriptor = loadPlugin( plugin, localRepository, remoteRepositories );
PluginDescriptor pluginDescriptor = loadPlugin( plugin, repositoryRequest );
MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( goal );

10
maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
View File

@ -15,9 +15,7 @@
* the License.
*/
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@ -30,15 +28,15 @@
public interface PluginManager
{
// igorf: Way too many declared exceptions!
PluginDescriptor loadPlugin( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
PluginDescriptor loadPlugin( Plugin plugin, RepositoryRequest repositoryRequest )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, InvalidPluginDescriptorException;
// igorf: Way too many declared exceptions!
MojoDescriptor getMojoDescriptor( String groupId, String artifactId, String version, String goal, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
MojoDescriptor getMojoDescriptor( String groupId, String artifactId, String version, String goal, RepositoryRequest repositoryRequest )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, MojoNotFoundException, InvalidPluginDescriptorException;
// igorf: Way too many declared exceptions!
MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, RepositoryRequest repositoryRequest )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, MojoNotFoundException, InvalidPluginDescriptorException;
void executeMojo( MavenSession session, MojoExecution execution )

19
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
View File

@ -24,6 +24,8 @@
import org.apache.maven.Maven;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@ -162,8 +164,12 @@ private List<String> getProfileIds( List<Profile> profiles )
private ModelBuildingRequest getModelBuildingRequest( ProjectBuildingRequest configuration,
ReactorModelPool reactorModelPool )
{
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setCache( configuration.getRepositoryCache() );
repositoryRequest.setLocalRepository( configuration.getLocalRepository() );
ModelResolver resolver =
new RepositoryModelResolver( repositorySystem, resolutionErrorHandler, configuration.getLocalRepository(),
new RepositoryModelResolver( repositorySystem, resolutionErrorHandler, repositoryRequest,
configuration.getRemoteRepositories(), reactorModelPool );
ModelBuildingRequest request = new DefaultModelBuildingRequest();
@ -191,6 +197,7 @@ public MavenProject build( Artifact artifact, ProjectBuildingRequest configurati
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
.setArtifact( artifact )
.setCache( configuration.getRepositoryCache() )
.setLocalRepository( configuration.getLocalRepository() )
.setRemoteRepositories( configuration.getRemoteRepositories() );
// FIXME setTransferListener
@ -257,6 +264,7 @@ public MavenProjectBuildingResult buildProjectWithDependencies( File pomFile, Pr
.setArtifact( artifact )
.setResolveRoot( false )
.setResolveTransitively( true )
.setCache( request.getRepositoryCache() )
.setLocalRepository( request.getLocalRepository() )
.setRemoteRepositories( project.getRemoteArtifactRepositories() )
.setManagedVersionMap( project.getManagedVersionMap() );
@ -492,9 +500,12 @@ private MavenProject toProject( ModelBuildingResult result, ProjectBuildingReque
{
if ( configuration.isProcessPlugins() )
{
lifecycle.populateDefaultConfigurationForPlugins( model.getBuild().getPlugins(),
configuration.getLocalRepository(),
project.getPluginArtifactRepositories() );
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setLocalRepository( configuration.getLocalRepository() );
repositoryRequest.setRemoteRepositories( project.getPluginArtifactRepositories() );
repositoryRequest.setCache( configuration.getRepositoryCache() );
lifecycle.populateDefaultConfigurationForPlugins( model.getBuild().getPlugins(), repositoryRequest );
}
}
catch ( LifecycleExecutionException e )

16
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
View File

@ -25,6 +25,7 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelEventListener;
@ -32,6 +33,9 @@
public class DefaultProjectBuildingRequest
implements ProjectBuildingRequest
{
private RepositoryCache repositoryCache;
private ArtifactRepository localRepository;
private List<ArtifactRepository> remoteRepositories;
@ -80,6 +84,18 @@ public void setTopLevelProjectForReactor( MavenProject mavenProject )
this.topProject = mavenProject;
}
public ProjectBuildingRequest setRepositoryCache( RepositoryCache repositoryCache )
{
this.repositoryCache = repositoryCache;
return this;
}
public RepositoryCache getRepositoryCache()
{
return repositoryCache;
}
public ProjectBuildingRequest setLocalRepository( ArtifactRepository localRepository )
{
this.localRepository = localRepository;

6
maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
View File

@ -25,12 +25,18 @@
import org.apache.maven.MavenTransferListener;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.wagon.events.TransferListener;
public interface ProjectBuildingRequest
{
ProjectBuildingRequest setRepositoryCache( RepositoryCache repositoryCache );
RepositoryCache getRepositoryCache();
ProjectBuildingRequest setLocalRepository( ArtifactRepository localRepository );
ArtifactRepository getLocalRepository();

16
maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
View File

@ -26,6 +26,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@ -51,14 +52,14 @@ class RepositoryModelResolver
private ResolutionErrorHandler resolutionErrorHandler;
private ArtifactRepository localRepository;
private RepositoryRequest repositoryRequest;
private List<ArtifactRepository> remoteRepositories;
private ReactorModelPool reactorModelPool;
public RepositoryModelResolver( RepositorySystem repositorySystem, ResolutionErrorHandler resolutionErrorHandler,
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
RepositoryRequest repositoryRequest, List<ArtifactRepository> remoteRepositories,
ReactorModelPool reactorModelPool )
{
if ( repositorySystem == null )
@ -73,11 +74,11 @@ public RepositoryModelResolver( RepositorySystem repositorySystem, ResolutionErr
}
this.resolutionErrorHandler = resolutionErrorHandler;
if ( localRepository == null )
if ( repositoryRequest == null )
{
throw new IllegalArgumentException( "no local repository specified" );
throw new IllegalArgumentException( "no repository request specified" );
}
this.localRepository = localRepository;
this.repositoryRequest = repositoryRequest;
if ( remoteRepositories == null )
{
@ -90,7 +91,7 @@ public RepositoryModelResolver( RepositorySystem repositorySystem, ResolutionErr
public ModelResolver newCopy()
{
return new RepositoryModelResolver( repositorySystem, resolutionErrorHandler, localRepository,
return new RepositoryModelResolver( repositorySystem, resolutionErrorHandler, repositoryRequest,
remoteRepositories, reactorModelPool );
}
@ -127,9 +128,8 @@ public ModelSource resolveModel( String groupId, String artifactId, String versi
{
Artifact artifactParent = repositorySystem.createProjectArtifact( groupId, artifactId, version );
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
ArtifactResolutionRequest request = new ArtifactResolutionRequest( repositoryRequest );
request.setArtifact( artifactParent );
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
// FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );

67
maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
View File

@ -32,6 +32,7 @@
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.RepositoryRequest;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
@ -55,6 +56,7 @@
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.repository.legacy.metadata.DefaultMetadataResolutionRequest;
import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
@ -88,13 +90,6 @@ public class MavenMetadataSource
@Requirement
private MavenMetadataCache cache;
public ResolutionGroup retrieve( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException
{
return retrieve( request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories(),
request.isResolveManagedVersions() );
}
public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException
@ -106,6 +101,19 @@ public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepo
List<ArtifactRepository> remoteRepositories, boolean resolveManagedVersions )
throws ArtifactMetadataRetrievalException
{
MetadataResolutionRequest request = new DefaultMetadataResolutionRequest();
request.setArtifact( artifact );
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
request.setResolveManagedVersions( resolveManagedVersions );
return retrieve( request );
}
public ResolutionGroup retrieve( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException
{
Artifact artifact = request.getArtifact();
//
// If we have a system scoped artifact then we do not want any searching in local or remote repositories
// and we want artifact resolution to only return the system scoped artifact itself.
@ -114,8 +122,10 @@ public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepo
{
return new ResolutionGroup( null, null, null );
}
ResolutionGroup cached = cache.get( artifact, resolveManagedVersions, localRepository, remoteRepositories );
ResolutionGroup cached =
cache.get( artifact, request.isResolveManagedVersions(), request.getLocalRepository(),
request.getRemoteRepositories() );
if ( cached != null )
{
@ -142,7 +152,7 @@ public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepo
}
else
{
ProjectRelocation rel = retrieveRelocatedProject( artifact, localRepository, remoteRepositories );
ProjectRelocation rel = retrieveRelocatedProject( artifact, request );
if ( rel == null )
{
@ -188,7 +198,7 @@ public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepo
Map<String, Artifact> managedVersions = null;
if ( managedDependencies != null && resolveManagedVersions )
if ( managedDependencies != null && request.isResolveManagedVersions() )
{
managedVersions = new HashMap<String, Artifact>();
@ -201,9 +211,10 @@ public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepo
}
ResolutionGroup result =
new ResolutionGroup( pomArtifact, relocatedArtifact, artifacts, managedVersions, remoteRepositories );
new ResolutionGroup( pomArtifact, relocatedArtifact, artifacts, managedVersions, request.getRemoteRepositories() );
cache.put( artifact, resolveManagedVersions, localRepository, remoteRepositories, result );
cache.put( artifact, request.isResolveManagedVersions(), request.getLocalRepository(),
request.getRemoteRepositories(), result );
return result;
}
@ -319,15 +330,25 @@ private ArtifactFilter createDependencyFilter( Dependency dependency, ArtifactFi
public List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException
{
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
MetadataResolutionRequest request = new DefaultMetadataResolutionRequest();
request.setArtifact( artifact );
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
return retrieveAvailableVersions( request );
}
public List<ArtifactVersion> retrieveAvailableVersions( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException
{
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( request.getArtifact() );
try
{
repositoryMetadataManager.resolve( metadata, remoteRepositories, localRepository );
repositoryMetadataManager.resolve( metadata, request );
}
catch ( RepositoryMetadataResolutionException e )
{
throw new ArtifactMetadataRetrievalException( e.getMessage(), e, artifact );
throw new ArtifactMetadataRetrievalException( e.getMessage(), e, request.getArtifact() );
}
return retrieveAvailableVersionsFromMetadata( metadata.getMetadata() );
@ -416,8 +437,7 @@ private ProjectBuilder getProjectBuilder()
return projectBuilder;
}
private ProjectRelocation retrieveRelocatedProject( Artifact artifact, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
private ProjectRelocation retrieveRelocatedProject( Artifact artifact, RepositoryRequest repositoryRequest )
throws ArtifactMetadataRetrievalException
{
MavenProject project = null;
@ -446,8 +466,9 @@ private ProjectRelocation retrieveRelocatedProject( Artifact artifact, ArtifactR
try
{
ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
configuration.setLocalRepository( localRepository );
configuration.setRemoteRepositories( remoteRepositories );
configuration.setRepositoryCache( repositoryRequest.getCache() );
configuration.setLocalRepository( repositoryRequest.getLocalRepository() );
configuration.setRemoteRepositories( repositoryRequest.getRemoteRepositories() );
configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
configuration.setProcessPlugins( false );
configuration.setSystemProperties( System.getProperties() );
@ -509,8 +530,10 @@ private ProjectRelocation retrieveRelocatedProject( Artifact artifact, ArtifactR
List<ArtifactVersion> available = artifact.getAvailableVersions();
if ( available != null && !available.isEmpty() )
{
available =
retrieveAvailableVersions( relocatedArtifact, localRepository, remoteRepositories );
MetadataResolutionRequest metadataRequest =
new DefaultMetadataResolutionRequest( repositoryRequest );
metadataRequest.setArtifact( relocatedArtifact );
available = retrieveAvailableVersions( metadataRequest );
relocatedArtifact.setAvailableVersions( available );
}

24
maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
View File

@ -7,6 +7,9 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Exclusion;
import org.apache.maven.project.MavenProject;
@ -38,6 +41,15 @@ protected String getProjectsDirectory()
return "src/test/projects/project-dependencies-resolver";
}
protected RepositoryRequest getRepositoryRequest()
throws InvalidRepositoryException
{
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( getLocalRepository() );
request.setRemoteRepositories( getRemoteRepositories() );
return request;
}
public void testExclusionsInDependencies()
throws Exception
{
@ -50,13 +62,11 @@ public void testExclusionsInDependencies()
.get();
Set<Artifact> artifactDependencies =
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), getLocalRepository(),
getRemoteRepositories() );
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), getRepositoryRequest() );
assertEquals( 0, artifactDependencies.size() );
artifactDependencies =
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_RUNTIME ), getLocalRepository(),
getRemoteRepositories() );
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_RUNTIME ), getRepositoryRequest() );
assertEquals( 1, artifactDependencies.size() );
assertEquals( "maven-core-it-support" , artifactDependencies.iterator().next().getArtifactId() );
}
@ -69,8 +79,7 @@ public void testSystemScopeDependencies()
.get();
Set<Artifact> artifactDependencies =
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), getLocalRepository(),
getRemoteRepositories() );
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), getRepositoryRequest() );
assertEquals( 1, artifactDependencies.size() );
}
@ -85,8 +94,7 @@ public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements()
MavenSession session = createMavenSession( pom, eps );
MavenProject project = session.getCurrentProject();
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), getLocalRepository(),
getRemoteRepositories() );
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), getRepositoryRequest() );
List<String> elements = project.getCompileClasspathElements();
assertEquals( 2, elements.size() );

24
maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
View File

@ -4,6 +4,8 @@
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@ -38,7 +40,17 @@ protected String getProjectsDirectory()
{
return "src/test/projects/plugin-manager";
}
private RepositoryRequest getRepositoryRequest( MavenSession session )
{
RepositoryRequest request = new DefaultRepositoryRequest();
request.setLocalRepository( session.getLocalRepository() );
request.setRemoteRepositories( session.getCurrentProject().getPluginArtifactRepositories() );
return request;
}
public void testPluginLoading()
throws Exception
{
@ -47,7 +59,7 @@ public void testPluginLoading()
plugin.setGroupId( "org.codehaus.plexus" );
plugin.setArtifactId( "plexus-component-metadata" );
plugin.setVersion( plexusVersion );
PluginDescriptor pluginDescriptor = pluginManager.loadPlugin( plugin, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );
PluginDescriptor pluginDescriptor = pluginManager.loadPlugin( plugin, getRepositoryRequest( session ) );
assertNotNull( pluginDescriptor );
}
@ -61,7 +73,7 @@ public void testMojoDescriptorRetrieval()
plugin.setArtifactId( "plexus-component-metadata" );
plugin.setVersion( plexusVersion );
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, getRepositoryRequest( session ) );
assertNotNull( mojoDescriptor );
assertEquals( "generate-metadata", mojoDescriptor.getGoal() );
// igorf: plugin realm comes later
@ -225,7 +237,11 @@ public void testThatPluginDependencyThatHasSystemScopeIsResolved()
ArtifactResolutionResult result = repositorySystem.resolve( request );
*/
List<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getPluginArtifactRepositories() );
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setLocalRepository( getLocalRepository() );
repositoryRequest.setRemoteRepositories( getPluginArtifactRepositories() );
List<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, repositoryRequest );
for ( Artifact a : artifacts )
{

3
maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
View File

@ -25,6 +25,7 @@
import java.util.Set;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
@ -75,7 +76,7 @@ public Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging )
return Collections.emptySet();
}
public void populateDefaultConfigurationForPlugins( Collection<Plugin> plugins, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
public void populateDefaultConfigurationForPlugins( Collection<Plugin> plugins, RepositoryRequest repositoryRequest )
throws LifecycleExecutionException
{
}