You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2026/05/18 05:50:17 UTC

(maven) branch backport-12049-to-4.0.x created (now 38b4203590)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch backport-12049-to-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git


      at 38b4203590 Filter transitive repositories with uninterpolated IDs (#12049) (#12050)

This branch includes the following new commits:

     new 38b4203590 Filter transitive repositories with uninterpolated IDs (#12049) (#12050)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(maven) 01/01: Filter transitive repositories with uninterpolated IDs (#12049) (#12050)

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch backport-12049-to-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 38b420359037ecae0cbeed448f7020eee7b1a37b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon May 18 07:49:42 2026 +0200

    Filter transitive repositories with uninterpolated IDs (#12049) (#12050)
    
    The existing filter in mergeRepositories already excluded transitive
    repositories with uninterpolated URLs but did not check repository IDs.
    When a transitive dependency POM contained an expression like
    ${eclipseP2RepoId} as a repository ID with a valid URL, it passed the
    filter and later caused MavenValidator to throw IllegalArgumentException.
    
    Co-authored-by: Claude Opus 4.6 (1M context) <no...@anthropic.com>
---
 .../main/java/org/apache/maven/impl/model/DefaultModelBuilder.java  | 4 +++-
 .../java/org/apache/maven/impl/model/DefaultModelBuilderTest.java   | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
index b3356a2208..7e155fa4dd 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
@@ -541,7 +541,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) {
diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
index 5f6146fc2c..d361faad12 100644
--- a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
+++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
@@ -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());