Skip to content

[MNG-7529] Maven resolver makes bad repository choices #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hgschmie merged 1 commit into from
Aug 25, 2022
Merged

[MNG-7529] Maven resolver makes bad repository choices #787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions ...vider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public class DefaultVersionRangeResolver

private static final String MAVEN_METADATA_XML = "maven-metadata.xml";

private static final String SNAPSHOT = "SNAPSHOT";

private MetadataResolver metadataResolver;

private SyncContextFactory syncContextFactory;
Expand Down Expand Up @@ -218,9 +220,11 @@ private Map<String, ArtifactRepository> getVersions( RepositorySystemSession ses
}

Versioning versioning = readVersions( session, trace, metadataResult.getMetadata(), repository, result );
RemoteRepository remoteRepository = metadataResult.getRequest().getRepository();

for ( String version : versioning.getVersions() )
{
if ( !versionIndex.containsKey( version ) )
if ( isEnabled( remoteRepository, version ) && !versionIndex.containsKey( version ) )
{
versionIndex.put( version, repository );
}
Expand All @@ -230,6 +234,19 @@ private Map<String, ArtifactRepository> getVersions( RepositorySystemSession ses
return versionIndex;
}

private boolean isEnabled( RemoteRepository remoteRepository, String version )
{
if ( remoteRepository == null )
{
return true;
}

boolean snapshot = version != null && version.endsWith( SNAPSHOT );

return remoteRepository.getPolicy( snapshot ).isEnabled();
}


private Versioning readVersions( RepositorySystemSession session, RequestTrace trace, Metadata metadata,
ArtifactRepository repository, VersionRangeResult result )
{
Expand Down Expand Up @@ -273,4 +290,4 @@ private void invalidMetadata( RepositorySystemSession session, RequestTrace trac
repositoryEventDispatcher.dispatch( event.build() );
}

}
}