Skip to content

Uninterpolated repositories from parent POMs during model building #11037

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
cstamas merged 3 commits into from
Aug 12, 2025
Merged

Uninterpolated repositories from parent POMs during model building #11037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0467247
Fix for #11021
cstamas Aug 11, 2025
d4fe0e7
Add UT
cstamas Aug 11, 2025
78c61a6
Reformat
cstamas Aug 11, 2025
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
1 change: 1 addition & 0 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ public void mergeRepositories(Model model, boolean replace) {
Model interpolatedModel = interpolateModel(
Model.newBuilder()
.pomFile(model.getPomFile())
.properties(model.getProperties())
.repositories(model.getRepositories())
.build(),
request,
Expand Down
14 changes: 11 additions & 3 deletions impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public void testMergeRepositories() throws Exception {
assertEquals(1, repositories.size()); // central

Model model = Model.newBuilder()
.properties(Map.of("thirdParentRepo", "https://third.repo"))
.repositories(Arrays.asList(
Repository.newBuilder()
.id("first")
Expand All @@ -100,18 +101,25 @@ public void testMergeRepositories() throws Exception {
Repository.newBuilder()
.id("second")
.url("${secondParentRepo}")
.build(),
Repository.newBuilder()
.id("third")
.url("${thirdParentRepo}")
.build()))
.build();

state.mergeRepositories(model, false);

// after merge
repositories = (List<RemoteRepository>) repositoriesField.get(state);
assertEquals(3, repositories.size());
assertEquals(4, repositories.size());
assertEquals("first", repositories.get(0).getId());
assertEquals("https://some.repo", repositories.get(0).getUrl()); // interpolated
assertEquals("https://some.repo", repositories.get(0).getUrl()); // interpolated (user properties)
assertEquals("second", repositories.get(1).getId());
assertEquals("${secondParentRepo}", repositories.get(1).getUrl()); // un-interpolated (no source)
assertEquals("central", repositories.get(2).getId()); // default
assertEquals("third", repositories.get(2).getId());
assertEquals("https://third.repo", repositories.get(2).getUrl()); // interpolated (own model properties)
assertEquals("central", repositories.get(3).getId()); // default
}

private Path getPom(String name) {
Expand Down
Loading