You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/09/14 06:59:05 UTC
[maven-resolver] 02/02: WIP
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch remote-repository-filter
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 278706d2f38f2a22eb06c62e30aaec7f2846d247
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Sep 14 08:58:51 2022 +0200
WIP
---
.../aether/internal/impl/DefaultArtifactResolver.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
index e494567e..9b100e3d 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
@@ -274,8 +274,9 @@ public class DefaultArtifactResolver
Artifact artifact = request.getArtifact();
- List<RemoteRepository> filteredRepos = new ArrayList<>( request.getRepositories().size() );
- for ( RemoteRepository repository : request.getRepositories() )
+ List<RemoteRepository> repos = request.getRepositories();
+ List<RemoteRepository> filteredRepos = new ArrayList<>( repos.size() );
+ for ( RemoteRepository repository : repos )
{
if ( !filter.acceptArtifact( repository, artifact ) )
{
@@ -312,7 +313,7 @@ public class DefaultArtifactResolver
VersionResult versionResult;
try
{
- VersionRequest versionRequest = new VersionRequest( artifact, filteredRepos,
+ VersionRequest versionRequest = new VersionRequest( artifact, repos,
request.getRequestContext() );
versionRequest.setTrace( trace );
versionResult = versionResolver.resolveVersion( session, versionRequest );
@@ -329,11 +330,11 @@ public class DefaultArtifactResolver
{
if ( versionResult.getRepository() instanceof RemoteRepository )
{
- filteredRepos = Collections.singletonList( (RemoteRepository) versionResult.getRepository() );
+ repos = Collections.singletonList( (RemoteRepository) versionResult.getRepository() );
}
else
{
- filteredRepos = Collections.emptyList();
+ repos = Collections.emptyList();
}
}
@@ -351,7 +352,7 @@ public class DefaultArtifactResolver
}
LocalArtifactResult local =
- lrm.find( session, new LocalArtifactRequest( artifact, filteredRepos, request.getRequestContext() ) );
+ lrm.find( session, new LocalArtifactRequest( artifact, repos, request.getRequestContext() ) );
if ( isLocallyInstalled( local, versionResult ) )
{
if ( local.getRepository() != null )
@@ -389,13 +390,13 @@ public class DefaultArtifactResolver
}
else if ( local.getFile() != null )
{
- LOGGER.debug( "Verifying availability of {} from {}", local.getFile(), filteredRepos );
+ LOGGER.debug( "Verifying availability of {} from {}", local.getFile(), repos );
}
- LOGGER.debug( "Resolving artifact {} from {}", artifact, filteredRepos );
+ LOGGER.debug( "Resolving artifact {} from {}", artifact, repos );
AtomicBoolean resolved = new AtomicBoolean( false );
Iterator<ResolutionGroup> groupIt = groups.iterator();
- for ( RemoteRepository repo : filteredRepos )
+ for ( RemoteRepository repo : repos )
{
if ( !repo.getPolicy( artifact.isSnapshot() ).isEnabled() )
{