Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,9 @@ public void mergeRepositories(Model model, boolean replace) {
// filter out transitive invalid repositories
// this should be safe because invalid repo coming from build POMs
// have been rejected earlier during validation
.filter(repo -> repo.getUrl() != null && !repo.getUrl().contains("${"))
.filter(repo -> repo.getUrl() != null
&& !repo.getUrl().contains("${")
&& (repo.getId() == null || !repo.getId().contains("${")))
.map(session::createRemoteRepository)
.toList();
if (replace) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,16 @@ public void testMergeRepositories() throws Exception {
Repository.newBuilder()
.id("third")
.url("${thirdParentRepo}")
.build(),
Repository.newBuilder()
.id("${uninterpolatedRepoId}")
.url("https://valid.url")
.build()))
.build();

state.mergeRepositories(model, false);

// after merge
// after merge: "second" filtered (uninterpolated URL), "${uninterpolatedRepoId}" filtered (uninterpolated ID)
repositories = (List<RemoteRepository>) repositoriesField.get(state);
assertEquals(3, repositories.size());
assertEquals("first", repositories.get(0).getId());
Expand Down
Loading