Fix Maven settings repos lost when context repos set independently#7208
Draft
Jenson3210 wants to merge 1 commit intomainfrom
Draft
Fix Maven settings repos lost when context repos set independently#7208Jenson3210 wants to merge 1 commit intomainfrom
Jenson3210 wants to merge 1 commit intomainfrom
Conversation
When MavenSettings was non-null, getRepositories(MavenSettings, List) re-derived repos exclusively from settings profiles, ignoring any repos set directly on the context via setRepositories(). This caused download failures when repos were configured independently of settings profiles. Now both settings-derived repos and context repos are included, with settings repos taking precedence by ID. Fixes moderneinc/customer-requests#2122
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
MavenSettingswas non-null,getRepositories(MavenSettings, List<String>)re-derived repos exclusively from settings profiles, ignoring any repos set directly on the context viasetRepositories().Test plan
Added
settingsReposUsedWhenPomRepoFails— verifies settings profile repos are used when POM repo failsAdded
contextReposUsedWhenPomRepoFails— verifies context repos are used when POM repo fails (no settings)Added
contextReposNotLostWhenMavenSettingsPresent— the reproducer: verifies context repos set aftersetMavenSettings()are not lost (was failing before fix)Existing
repositoryOrdertest still passesFull
rewrite-maventest suite passesFixes https://github.com/moderneinc/customer-requests/issues/2122