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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 5378f160a3 Add id() to name-keyed SPI interfaces and switch to 
List-based injection
5378f160a3 is described below

commit 5378f160a3d4bde9d2fde0d47feaf9b338c09164
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Nov 12 17:17:54 2026 +0100

    Add id() to name-keyed SPI interfaces and switch to List-based injection
    
    Add an id() default method to ModelParser and SettingsParser for 
diagnostics and duplicate detection. Document why PropertyContributor 
intentionally omits id(). Switch DefaultModelProcessor, DefaultSettingsBuilder, 
and PropertyContributorsHolder from Map<String, T> to List<T> injection. Add 
duplicate-id detection with LOGGER.warn. Update all tests and ITs; fix IT 
extension POMs that hardcoded an old Maven version.
---
 .../java/org/apache/maven/api/spi/ModelParser.java |  16 +++
 .../apache/maven/api/spi/PropertyContributor.java  |   7 ++
 .../org/apache/maven/api/spi/SettingsParser.java   |  14 +++
 .../apache/maven/cling/invoker/LookupInvoker.java  |   6 +-
 .../invoker/spi/PropertyContributorsHolder.java    |  10 +-
 .../src/test/java/org/apache/maven/di/DiTest.java  |  25 +++++
 .../maven/graph/DefaultGraphBuilderTest.java       |   2 +-
 .../apache/maven/impl/DefaultSettingsBuilder.java  |  51 ++++++---
 .../org/apache/maven/impl/XmlSettingsParser.java   |   5 +
 .../impl/model/DefaultModelDialectManager.java     |   5 +
 .../maven/impl/model/DefaultModelProcessor.java    |  37 +++++--
 .../maven/impl/DefaultDialectRegistryTest.java     |   5 +
 .../maven/impl/DefaultPluginXmlFactoryTest.java    |   4 +-
 .../maven/impl/DefaultSettingsParserTest.java      | 115 +++++++++++----------
 .../impl/model/DefaultModelProcessorTest.java      |  23 +++--
 .../plugin/stubs/RepositorySystemSupplier.java     |   2 +-
 .../it/MavenITmng7836AlternativePomSyntaxTest.java |   1 +
 .../it/MavenITmng8220ExtensionWithDITest.java      |   1 +
 .../maven-hocon-extension/pom.xml                  |   4 +-
 .../org/apache/maven/hocon/HoconModelReader.java   |   5 +
 .../extensions/extension1/pom.xml                  |   6 ++
 .../its/mng8220/extension1/DumbModelParser1.java   |   5 +
 .../extensions/extension2/pom.xml                  |   6 ++
 .../its/mng8220/extension2/DumbModelParser2.java   |   5 +
 .../extensions/extension3/pom.xml                  |   2 +-
 .../its/mng8220/extension3/DumbModelParser3.java   |   5 +
 .../extensions/extension4/pom.xml                  |   2 +-
 .../its/mng8220/extension4/DumbModelParser4.java   |   5 +
 .../its/mng8655/PropertiesSettingsParser.java      |   5 +
 29 files changed, 276 insertions(+), 103 deletions(-)

diff --git 
a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ModelParser.java 
b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ModelParser.java
index 3f370e5a94..6f877158a9 100644
--- a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ModelParser.java
+++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ModelParser.java
@@ -36,6 +36,10 @@
  * Note: to provide a Maven model "dialect" that supports symmetric 
translation, implement
  * {@link ModelDialectProvider}, which composes a pair of parser and writer.
  *
+ * <p>
+ * Implementations must declare a unique identifier via {@link #id()} to allow 
Maven to
+ * distinguish parsers in diagnostics and detect conflicts between extensions.
+ *
  * @since 4.0.0
  * @see ModelDialectProvider
  * @see DialectProvider
@@ -44,6 +48,18 @@
 @Consumer
 public interface ModelParser extends SpiService {
 
+    /**
+     * Returns a unique identifier for this parser, used in diagnostics when 
multiple
+     * parsers fail or conflict. Must be globally unique across all extensions.
+     *
+     * @return the parser identifier, never {@code null}
+     * @since 4.2.0
+     */
+    @Nonnull
+    default String id() {
+        return getClass().getName();
+    }
+
     /**
      * Option that can be specified in the options map.  The value should be a 
Boolean.
      */
diff --git 
a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PropertyContributor.java
 
b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PropertyContributor.java
index c78c746db8..425e657f3b 100644
--- 
a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PropertyContributor.java
+++ 
b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PropertyContributor.java
@@ -29,6 +29,13 @@
  * Component able to contribute to Maven session user properties. This SPI 
component is invoked
  * very early, while there is no session created yet.
  *
+ * <p>
+ * Unlike {@link ModelParser} and {@link SettingsParser}, this interface 
intentionally does not
+ * declare an {@code id()} method: all registered contributors are invoked 
sequentially and their
+ * effects accumulated, so there is no winner-takes-all conflict to detect. 
Implementations should
+ * still be annotated with a unique {@code @Named("my-unique-id")} so that the 
DI container can
+ * distinguish them, but Maven itself does not perform duplicate detection for 
this SPI.
+ *
  * @since 4.0.0
  */
 @Experimental
diff --git 
a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/SettingsParser.java 
b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/SettingsParser.java
index e0f7fa963e..20dd43be58 100644
--- 
a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/SettingsParser.java
+++ 
b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/SettingsParser.java
@@ -37,12 +37,26 @@
  * Parsers must be available in the container building the settings. In 
particular, a parser
  * supplied by a core extension cannot read the bootstrap settings needed to 
resolve that
  * extension. This SPI does not change settings file discovery or extension 
loading.
+ * <p>
+ * Implementations must declare a unique identifier via {@link #id()} to allow 
Maven to
+ * distinguish parsers in diagnostics and detect conflicts between extensions.
  *
  * @since 4.2.0
  */
 @Experimental
 @Consumer
 public interface SettingsParser extends SpiService {
+    /**
+     * Returns a unique identifier for this parser, used in diagnostics when 
multiple
+     * parsers match or conflict. Must be globally unique across all 
extensions.
+     *
+     * @return the parser identifier, never {@code null}
+     */
+    @Nonnull
+    default String id() {
+        return getClass().getName();
+    }
+
     /**
      * Option that can be specified in the options map. The value should be a 
{@code Boolean};
      * when {@code true} or absent, unknown input is rejected.
diff --git 
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java
 
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java
index 34dd6bdb46..b9555fbaa3 100644
--- 
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java
+++ 
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java
@@ -573,10 +573,8 @@ protected ContainerCapsuleFactory<C> 
createContainerCapsuleFactory() {
 
     protected void postContainer(C context) throws Exception {
         ProtoSession protoSession = context.protoSession;
-        for (PropertyContributor propertyContributor : context.lookup
-                .lookup(PropertyContributorsHolder.class)
-                .getPropertyContributors()
-                .values()) {
+        for (PropertyContributor propertyContributor :
+                
context.lookup.lookup(PropertyContributorsHolder.class).getPropertyContributors())
 {
             protoSession = protoSession.toBuilder()
                     
.withUserProperties(propertyContributor.contribute(protoSession))
                     .build();
diff --git 
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/spi/PropertyContributorsHolder.java
 
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/spi/PropertyContributorsHolder.java
index f142210b31..bec2c38dce 100644
--- 
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/spi/PropertyContributorsHolder.java
+++ 
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/spi/PropertyContributorsHolder.java
@@ -18,25 +18,25 @@
  */
 package org.apache.maven.cling.invoker.spi;
 
-import java.util.Map;
+import java.util.List;
 
 import org.apache.maven.api.di.Inject;
 import org.apache.maven.api.di.Named;
 import org.apache.maven.api.spi.PropertyContributor;
 
 /**
- * Hack: to circumvent sisu/plexus/di stuff.
+ * Holds the list of {@link PropertyContributor} SPI implementations collected 
by the DI container.
  */
 @Named
 public final class PropertyContributorsHolder {
-    private final Map<String, PropertyContributor> propertyContributors;
+    private final List<PropertyContributor> propertyContributors;
 
     @Inject
-    public PropertyContributorsHolder(Map<String, PropertyContributor> 
propertyContributors) {
+    public PropertyContributorsHolder(List<PropertyContributor> 
propertyContributors) {
         this.propertyContributors = propertyContributors;
     }
 
-    public Map<String, PropertyContributor> getPropertyContributors() {
+    public List<PropertyContributor> getPropertyContributors() {
         return propertyContributors;
     }
 }
diff --git a/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java 
b/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java
index 2b3a0a861c..ed9d32d635 100644
--- a/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java
+++ b/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java
@@ -115,6 +115,11 @@ static class DiInjected {
         @Named
         @Singleton
         static class TestModelParser implements ModelParser {
+            @Override
+            public String id() {
+                return "test-parser";
+            }
+
             @Override
             public Optional<Source> locate(Path dir) {
                 return Optional.empty();
@@ -187,6 +192,11 @@ static class DiInjected {
         @org.apache.maven.api.di.Named
         @org.apache.maven.api.di.Singleton
         static class TestModelParser implements ModelParser {
+            @Override
+            public String id() {
+                return "test-parser";
+            }
+
             @Override
             public Optional<Source> locate(Path dir) {
                 return Optional.empty();
@@ -258,6 +268,11 @@ static class DiInjected {
 
         @org.apache.maven.api.di.Named
         static class TestModelParser implements ModelParser {
+            @Override
+            public String id() {
+                return "test-parser";
+            }
+
             @Override
             public Optional<Source> locate(Path dir) {
                 return Optional.empty();
@@ -338,6 +353,11 @@ static class DiInjected {
         @javax.inject.Named("sisu")
         @org.eclipse.sisu.Priority(100)
         static class TestModelParserSisu implements ModelParser {
+            @Override
+            public String id() {
+                return "test-parser-sisu";
+            }
+
             @Override
             public Optional<Source> locate(Path dir) {
                 return Optional.empty();
@@ -351,6 +371,11 @@ public Model parse(Source source, Map<String, ?> options) 
throws ModelParserExce
 
         // @org.apache.maven.api.di.Named("di")
         static class TestModelParserDi implements ModelParser {
+            @Override
+            public String id() {
+                return "test-parser-di";
+            }
+
             @Override
             public Optional<Source> locate(Path dir) {
                 return Optional.empty();
diff --git 
a/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
 
b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 72dad0b244..07bcbf90d4 100644
--- 
a/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++ 
b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -105,7 +105,7 @@ class DefaultGraphBuilderTest {
 
     // Not using mocks for these strategies - a mock would just copy the 
actual implementation.
 
-    private final ModelProcessor modelProcessor = new 
DefaultModelProcessor(null, Map.of());
+    private final ModelProcessor modelProcessor = new 
DefaultModelProcessor(null, List.of());
     private final PomlessCollectionStrategy pomlessCollectionStrategy = new 
PomlessCollectionStrategy(projectBuilder);
     private final MultiModuleCollectionStrategy multiModuleCollectionStrategy =
             new MultiModuleCollectionStrategy(modelProcessor, 
projectsSelector);
diff --git 
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
 
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
index 695ad384ed..3ac9bc6e88 100644
--- 
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
+++ 
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
@@ -26,6 +26,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -64,6 +65,8 @@
 import org.codehaus.plexus.components.secdispatcher.Dispatcher;
 import org.codehaus.plexus.components.secdispatcher.SecDispatcher;
 import 
org.codehaus.plexus.components.secdispatcher.internal.DefaultSecDispatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Builds the effective settings from a user settings file and/or a global 
settings file.
@@ -71,6 +74,8 @@
 @Named
 public class DefaultSettingsBuilder implements SettingsBuilder {
 
+    private static final Logger LOGGER = 
LoggerFactory.getLogger(DefaultSettingsBuilder.class);
+
     private final DefaultSettingsValidator settingsValidator = new 
DefaultSettingsValidator();
 
     // Package-private so SettingsUtilsV4 can reuse the same configured merger 
instance.
@@ -105,7 +110,7 @@ protected KeyComputer<Profile> getProfileKey() {
 
     private final SettingsParser xmlSettingsParser;
 
-    private final Map<String, SettingsParser> settingsParsers;
+    private final List<SettingsParser> settingsParsers;
 
     private final Interpolator interpolator;
 
@@ -116,7 +121,7 @@ protected KeyComputer<Profile> getProfileKey() {
      */
     public DefaultSettingsBuilder(
             SettingsXmlFactory settingsXmlFactory, Interpolator interpolator, 
Map<String, Dispatcher> dispatchers) {
-        this(settingsXmlFactory, interpolator, dispatchers, Map.of());
+        this(settingsXmlFactory, interpolator, dispatchers, List.of());
     }
 
     @Inject
@@ -124,13 +129,31 @@ public DefaultSettingsBuilder(
             SettingsXmlFactory settingsXmlFactory,
             Interpolator interpolator,
             Map<String, Dispatcher> dispatchers,
-            @Nullable Map<String, SettingsParser> settingsParsers) {
+            @Nullable List<SettingsParser> settingsParsers) {
         this.xmlSettingsParser = new XmlSettingsParser(settingsXmlFactory);
-        this.settingsParsers = settingsParsers != null ? settingsParsers : 
Map.of();
+        this.settingsParsers = deduplicate(settingsParsers);
         this.interpolator = interpolator;
         this.dispatchers = dispatchers;
     }
 
+    private static List<SettingsParser> deduplicate(@Nullable 
List<SettingsParser> parsers) {
+        if (parsers == null || parsers.isEmpty()) {
+            return List.of();
+        }
+        Map<String, SettingsParser> seen = new LinkedHashMap<>();
+        for (SettingsParser parser : parsers) {
+            SettingsParser previous = seen.putIfAbsent(parser.id(), parser);
+            if (previous != null) {
+                LOGGER.warn(
+                        "Duplicate settings parser id '{}': {} already 
registered, ignoring {}",
+                        parser.id(),
+                        previous.getClass().getName(),
+                        parser.getClass().getName());
+            }
+        }
+        return List.copyOf(seen.values());
+    }
+
     @Override
     public SettingsBuilderResult build(SettingsBuilderRequest request) throws 
SettingsBuilderException {
         ProblemCollector<BuilderProblem> problems = 
ProblemCollector.create(request.getSession());
@@ -389,33 +412,27 @@ public Source resolve(String relative) {
 
     @Nullable
     private SettingsParser selectParser(Source source, 
ProblemCollector<BuilderProblem> problems) {
-        List<Map.Entry<String, SettingsParser>> matches = new ArrayList<>();
-        for (Map.Entry<String, SettingsParser> entry : 
settingsParsers.entrySet()) {
+        List<SettingsParser> matches = new ArrayList<>();
+        for (SettingsParser parser : settingsParsers) {
             try {
-                if (entry.getValue().supports(source)) {
-                    matches.add(entry);
+                if (parser.supports(source)) {
+                    matches.add(parser);
                 }
             } catch (RuntimeException e) {
-                String msg = "Settings parser '" + parserName(entry.getKey())
-                        + "' failed to determine support for this source";
+                String msg = "Settings parser '" + parser.id() + "' failed to 
determine support for this source";
                 problems.reportProblem(
                         new DefaultBuilderProblem(source.getLocation(), -1, 
-1, e, msg, BuilderProblem.Severity.FATAL));
                 return null;
             }
         }
         if (matches.size() > 1) {
-            String parsers =
-                    matches.stream().map(e -> 
parserName(e.getKey())).sorted().collect(Collectors.joining(", "));
+            String parsers = 
matches.stream().map(SettingsParser::id).sorted().collect(Collectors.joining(", 
"));
             String msg = "Multiple settings parsers support this source: " + 
parsers;
             problems.reportProblem(
                     new DefaultBuilderProblem(source.getLocation(), -1, -1, 
null, msg, BuilderProblem.Severity.FATAL));
             return null;
         }
-        return matches.isEmpty() ? xmlSettingsParser : 
matches.get(0).getValue();
-    }
-
-    private static String parserName(@Nullable String key) {
-        return key != null ? key : "<unnamed>";
+        return matches.isEmpty() ? xmlSettingsParser : matches.get(0);
     }
 
     private Settings interpolate(
diff --git 
a/impl/maven-impl/src/main/java/org/apache/maven/impl/XmlSettingsParser.java 
b/impl/maven-impl/src/main/java/org/apache/maven/impl/XmlSettingsParser.java
index 5e1c720231..a64d7d8714 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/XmlSettingsParser.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/XmlSettingsParser.java
@@ -37,6 +37,11 @@ final class XmlSettingsParser implements SettingsParser {
         this.settingsXmlFactory = settingsXmlFactory;
     }
 
+    @Override
+    public String id() {
+        return "xml";
+    }
+
     @Override
     public boolean supports(Source source) {
         return true;
diff --git 
a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelDialectManager.java
 
b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelDialectManager.java
index 31b45e5653..d91cf3f94d 100644
--- 
a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelDialectManager.java
+++ 
b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelDialectManager.java
@@ -70,6 +70,11 @@ public DefaultModelDialectManager(
 
     private static ModelDialectProvider getXmlDialectProvider(ModelXmlFactory 
modelXmlFactory) {
         ModelParser xmlModelParser = new ModelParser() {
+            @Override
+            public String id() {
+                return "xml";
+            }
+
             @Override
             public Optional<Source> locate(Path dir) {
                 if (Files.isDirectory(dir)) {
diff --git 
a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java
 
b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java
index ed2fe3203e..fdd901354e 100644
--- 
a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java
+++ 
b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java
@@ -26,6 +26,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -44,6 +45,8 @@
 import org.apache.maven.api.services.xml.XmlReaderRequest;
 import org.apache.maven.api.spi.ModelParser;
 import org.apache.maven.api.spi.ModelParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -74,20 +77,40 @@
 @Singleton
 public class DefaultModelProcessor implements ModelProcessor {
 
+    private static final Logger LOGGER = 
LoggerFactory.getLogger(DefaultModelProcessor.class);
+
     private final ModelXmlFactory modelXmlFactory;
-    private final Map<String, ModelParser> modelParsers;
+    private final List<ModelParser> modelParsers;
 
     @Inject
-    public DefaultModelProcessor(ModelXmlFactory modelXmlFactory, @Nullable 
Map<String, ModelParser> modelParsers) {
+    public DefaultModelProcessor(ModelXmlFactory modelXmlFactory, @Nullable 
List<ModelParser> modelParsers) {
         this.modelXmlFactory = modelXmlFactory;
-        this.modelParsers = modelParsers != null ? modelParsers : Map.of();
+        this.modelParsers = deduplicate(modelParsers);
+    }
+
+    private static List<ModelParser> deduplicate(@Nullable List<ModelParser> 
parsers) {
+        if (parsers == null || parsers.isEmpty()) {
+            return List.of();
+        }
+        Map<String, ModelParser> seen = new LinkedHashMap<>();
+        for (ModelParser parser : parsers) {
+            ModelParser previous = seen.putIfAbsent(parser.id(), parser);
+            if (previous != null) {
+                LOGGER.warn(
+                        "Duplicate model parser id '{}': {} already 
registered, ignoring {}",
+                        parser.id(),
+                        previous.getClass().getName(),
+                        parser.getClass().getName());
+            }
+        }
+        return List.copyOf(seen.values());
     }
 
     @Override
     public Path locateExistingPom(Path projectDirectory) {
         // Note that the ModelProcessor#locatePom never returns null
         // while the ModelParser#locatePom needs to return an existing path!
-        Path pom = modelParsers.values().stream()
+        Path pom = modelParsers.stream()
                 .map(m -> m.locate(projectDirectory)
                         .map(org.apache.maven.api.services.Source::getPath)
                         .orElse(null))
@@ -108,14 +131,14 @@ public Model read(Source source, Map<String, ?> options) 
throws ModelParserExcep
             // a parser may locate the project directory itself rather than a 
file within it
             Path projectDirectory = Files.isDirectory(pomFile) ? pomFile : 
pomFile.getParent();
             Map<String, ModelParserException> exceptions = new 
LinkedHashMap<>();
-            for (Map.Entry<String, ModelParser> parser : 
modelParsers.entrySet()) {
+            for (ModelParser parser : modelParsers) {
                 try {
-                    Optional<Model> model = 
parser.getValue().locateAndParse(projectDirectory, options);
+                    Optional<Model> model = 
parser.locateAndParse(projectDirectory, options);
                     if (model.isPresent()) {
                         return model.get().withPomFile(pomFile);
                     }
                 } catch (ModelParserException e) {
-                    exceptions.put(parser.getKey(), e);
+                    exceptions.put(parser.id(), e);
                 }
             }
             try {
diff --git 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultDialectRegistryTest.java
 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultDialectRegistryTest.java
index fd1a77ff74..057baa1622 100644
--- 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultDialectRegistryTest.java
+++ 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultDialectRegistryTest.java
@@ -56,6 +56,11 @@ public Dialect getDialect() {
             @Override
             public ModelParser getModelParser() {
                 return new ModelParser() {
+                    @Override
+                    public String id() {
+                        return "test-dialect";
+                    }
+
                     @Override
                     public Optional<Source> locate(Path dir) {
                         return Optional.empty();
diff --git 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java
 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java
index 21be40ca31..bd4d3b7b22 100644
--- 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java
+++ 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java
@@ -27,7 +27,7 @@
 import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Map;
+import java.util.List;
 
 import com.ctc.wstx.exc.WstxEOFException;
 import org.apache.maven.api.plugin.descriptor.PluginDescriptor;
@@ -299,7 +299,7 @@ void readMalformedXmlThrowsXmlReaderException() {
     @Test
     void locateExistingPomWithFilePathShouldReturnSameFileIfRegularFile() 
throws IOException {
         Path pomFile = Files.createTempFile(tempDir, "pom", ".xml");
-        DefaultModelProcessor processor = new 
DefaultModelProcessor(mock(ModelXmlFactory.class), Map.of());
+        DefaultModelProcessor processor = new 
DefaultModelProcessor(mock(ModelXmlFactory.class), List.of());
         assertEquals(
                 pomFile, processor.locateExistingPom(pomFile), "Expected 
locateExistingPom to return the same file");
     }
diff --git 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsParserTest.java
 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsParserTest.java
index 93cca276b6..11accafa11 100644
--- 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsParserTest.java
+++ 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsParserTest.java
@@ -26,8 +26,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -75,7 +73,7 @@ class DefaultSettingsParserTest {
     void customSettings() throws Exception {
         Path source = directory.resolve("settings.properties");
         Files.writeString(source, propertiesSettings() + "\n");
-        var result = build(Sources.fromPath(source), Map.of("properties", new 
PropertiesSettingsParser()));
+        var result = build(Sources.fromPath(source), List.of(new 
PropertiesSettingsParser()));
         assertEquals(
                 directory.resolve("repository").toString(),
                 result.getEffectiveSettings().getLocalRepository());
@@ -83,9 +81,7 @@ void customSettings() throws Exception {
 
     @Test
     void sourceWithoutBackingFile() throws Exception {
-        var result = build(
-                source("memory.properties", propertiesSettings()),
-                Map.of("properties", new PropertiesSettingsParser()));
+        var result = build(source("memory.properties", propertiesSettings()), 
List.of(new PropertiesSettingsParser()));
         assertEquals(
                 directory.resolve("repository").toString(),
                 result.getEffectiveSettings().getLocalRepository());
@@ -95,13 +91,13 @@ void sourceWithoutBackingFile() throws Exception {
     void xmlFallbackDoesNotRequireXmlExtension() throws Exception {
         var result = build(
                 source("settings.conf", 
"<settings><offline>true</offline></settings>"),
-                Map.of("properties", new PropertiesSettingsParser()));
+                List.of(new PropertiesSettingsParser()));
         assertTrue(result.getEffectiveSettings().isOffline());
     }
 
     @Test
     void xmlStrictFailureBecomesWarningAfterLenientParsing() throws Exception {
-        var result = build(source("settings.xml", 
"<settings>\n<unknown/>\n</settings>"), Map.of());
+        var result = build(source("settings.xml", 
"<settings>\n<unknown/>\n</settings>"), List.of());
         var problems =
                 
result.getProblems().problems(BuilderProblem.Severity.WARNING).toList();
         assertEquals(1, problems.size());
@@ -112,7 +108,8 @@ void xmlStrictFailureBecomesWarningAfterLenientParsing() 
throws Exception {
     @Test
     void malformedXmlIsFatal() throws Exception {
         var error = assertThrows(
-                SettingsBuilderException.class, () -> 
build(source("settings.xml", "<settings>\n<offline>"), Map.of()));
+                SettingsBuilderException.class,
+                () -> build(source("settings.xml", "<settings>\n<offline>"), 
List.of()));
         assertTrue(error.getMessage().contains("Non-parseable settings 
settings.xml"));
         assertTrue(error.getProblemCollector()
                 .problems(BuilderProblem.Severity.FATAL)
@@ -132,7 +129,7 @@ public Settings parse(Source source, Map<String, ?> 
options) {
                 return Settings.newInstance().withOffline(true);
             }
         };
-        var result = build(source("settings.properties", "unknown=value"), 
Map.of("properties", parser));
+        var result = build(source("settings.properties", "unknown=value"), 
List.of(parser));
         assertEquals(List.of(true, false), calls);
         assertTrue(result.getEffectiveSettings().isOffline());
         var problem = result.getProblems()
@@ -147,11 +144,12 @@ public Settings parse(Source source, Map<String, ?> 
options) {
     @Test
     void selectedParserFailureDoesNotFallBackToXml() throws Exception {
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any())).thenReturn(true);
         when(parser.parse(any(), any())).thenThrow(new 
SettingsParserException("Invalid custom settings", 4, 2, null));
         var error = assertThrows(
                 SettingsBuilderException.class,
-                () -> build(source("settings.properties", "<settings/>"), 
Map.of("properties", parser)));
+                () -> build(source("settings.properties", "<settings/>"), 
List.of(parser)));
         assertTrue(error.getMessage().contains("Invalid custom settings"));
         var problem = error.getProblemCollector()
                 .problems(BuilderProblem.Severity.FATAL)
@@ -165,13 +163,13 @@ void selectedParserFailureDoesNotFallBackToXml() throws 
Exception {
     @Test
     void strictWarningSurvivesFailedLenientParsing() throws Exception {
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any())).thenReturn(true);
         var strict = new SettingsParserException("Unknown setting", 3, 7, 
null);
         var lenient = new SettingsParserException("Invalid value", 5, 2, null);
         when(parser.parse(any(), any())).thenThrow(strict).thenThrow(lenient);
         var error = assertThrows(
-                SettingsBuilderException.class,
-                () -> build(source("settings.properties", ""), 
Map.of("properties", parser)));
+                SettingsBuilderException.class, () -> 
build(source("settings.properties", ""), List.of(parser)));
         var warnings = error.getProblemCollector()
                 .problems(BuilderProblem.Severity.WARNING)
                 .toList();
@@ -198,13 +196,13 @@ void strictWarningSurvivesFailedLenientParsing() throws 
Exception {
     @Test
     void strictWarningSurvivesUnreadableLenientInput() throws Exception {
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any())).thenReturn(true);
         var strict = new SettingsParserException("Unknown setting", 3, 7, 
null);
         var unreadable = new IOException("Read failed");
         when(parser.parse(any(), 
any())).thenThrow(strict).thenThrow(unreadable);
         var error = assertThrows(
-                SettingsBuilderException.class,
-                () -> build(source("settings.properties", ""), 
Map.of("properties", parser)));
+                SettingsBuilderException.class, () -> 
build(source("settings.properties", ""), List.of(parser)));
         var warnings = error.getProblemCollector()
                 .problems(BuilderProblem.Severity.WARNING)
                 .toList();
@@ -224,12 +222,12 @@ void strictWarningSurvivesUnreadableLenientInput() throws 
Exception {
     @Test
     void causeOnlyParserFailureHasUsefulDiagnostic() throws Exception {
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any())).thenReturn(true);
         when(parser.parse(any(), any()))
                 .thenThrow(new SettingsParserException(new 
IllegalArgumentException("Invalid value")));
         var error = assertThrows(
-                SettingsBuilderException.class,
-                () -> build(source("settings.properties", ""), 
Map.of("properties", parser)));
+                SettingsBuilderException.class, () -> 
build(source("settings.properties", ""), List.of(parser)));
         var fatal = error.getProblemCollector()
                 .problems(BuilderProblem.Severity.FATAL)
                 .findFirst()
@@ -240,12 +238,14 @@ void causeOnlyParserFailureHasUsefulDiagnostic() throws 
Exception {
     @Test
     void conflictingParsersAreReportedBeforeParsing() throws Exception {
         SettingsParser first = mock(SettingsParser.class);
+        when(first.id()).thenReturn("first");
         SettingsParser second = mock(SettingsParser.class);
+        when(second.id()).thenReturn("second");
         when(first.supports(any())).thenReturn(true);
         when(second.supports(any())).thenReturn(true);
         var error = assertThrows(
                 SettingsBuilderException.class,
-                () -> build(source("settings.properties", "<settings/>"), 
Map.of("second", second, "first", first)));
+                () -> build(source("settings.properties", "<settings/>"), 
List.of(second, first)));
         var fatals = error.getProblemCollector()
                 .problems(BuilderProblem.Severity.FATAL)
                 .toList();
@@ -265,35 +265,28 @@ void supportsFailurePreventsXmlFallback() throws 
Exception {
         assertSupportsFailureStopsSelectionAndParsing("broken", false);
     }
 
-    @Test
-    void unnamedSupportsFailurePreventsXmlFallback() throws Exception {
-        assertSupportsFailureStopsSelectionAndParsing(null, false);
-    }
-
     @Test
     void supportsFailurePreventsPreviouslyMatchedParser() throws Exception {
         assertSupportsFailureStopsSelectionAndParsing("broken", true);
     }
 
-    @Test
-    void unnamedSupportsFailurePreventsPreviouslyMatchedParser() throws 
Exception {
-        assertSupportsFailureStopsSelectionAndParsing(null, true);
-    }
-
-    private void assertSupportsFailureStopsSelectionAndParsing(String 
providerName, boolean matchingFirst)
+    private void assertSupportsFailureStopsSelectionAndParsing(String 
parserId, boolean matchingFirst)
             throws Exception {
         SettingsParser matching = mock(SettingsParser.class);
         SettingsParser broken = mock(SettingsParser.class);
         SettingsParser unvisited = mock(SettingsParser.class);
+        when(matching.id()).thenReturn("matching");
         when(matching.supports(any())).thenReturn(true);
+        when(broken.id()).thenReturn(parserId);
         var failure = new IllegalStateException();
         when(broken.supports(any())).thenThrow(failure);
-        var parsers = new LinkedHashMap<String, SettingsParser>();
+        when(unvisited.id()).thenReturn("unvisited");
+        var parsers = new ArrayList<SettingsParser>();
         if (matchingFirst) {
-            parsers.put("matching", matching);
+            parsers.add(matching);
         }
-        parsers.put(providerName, broken);
-        parsers.put("unvisited", unvisited);
+        parsers.add(broken);
+        parsers.add(unvisited);
         var xmlFactory = mock(SettingsXmlFactory.class);
         var builder = new DefaultSettingsBuilder(xmlFactory, new 
DefaultInterpolator(), Map.of(), parsers);
         var source = source("settings.xml", "<settings/>");
@@ -309,9 +302,7 @@ private void 
assertSupportsFailureStopsSelectionAndParsing(String providerName,
         assertEquals(1, fatals.size());
         var fatal = fatals.get(0);
         assertEquals(
-                "Settings parser '" + (providerName != null ? providerName : 
"<unnamed>")
-                        + "' failed to determine support for this source",
-                fatal.getMessage());
+                "Settings parser '" + parserId + "' failed to determine 
support for this source", fatal.getMessage());
         assertEquals("settings.xml", fatal.getSource());
         assertEquals(-1, fatal.getLineNumber());
         assertEquals(-1, fatal.getColumnNumber());
@@ -322,7 +313,9 @@ private void 
assertSupportsFailureStopsSelectionAndParsing(String providerName,
             verify(matching, never()).parse(any(), any());
         }
         verify(broken, never()).parse(any(), any());
-        verifyNoInteractions(unvisited, xmlFactory);
+        verify(unvisited, never()).supports(any());
+        verify(unvisited, never()).parse(any(), any());
+        verifyNoInteractions(xmlFactory);
         verify(source, never()).openStream();
     }
 
@@ -331,7 +324,7 @@ void unreadableXmlSourceIsNotRetried() throws Exception {
         Source source = mock(Source.class);
         when(source.getLocation()).thenReturn("unreadable.xml");
         when(source.openStream()).thenThrow(new IOException("Read failed"));
-        var error = assertThrows(SettingsBuilderException.class, () -> 
build(source, Map.of()));
+        var error = assertThrows(SettingsBuilderException.class, () -> 
build(source, List.of()));
         assertTrue(error.getMessage().contains("Non-readable settings 
unreadable.xml"));
         verify(source).openStream();
     }
@@ -339,11 +332,11 @@ void unreadableXmlSourceIsNotRetried() throws Exception {
     @Test
     void customIoFailureIsNotRetried() throws Exception {
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any())).thenReturn(true);
         when(parser.parse(any(), any())).thenThrow(new IOException("Read 
failed"));
         var error = assertThrows(
-                SettingsBuilderException.class,
-                () -> build(source("settings.properties", ""), 
Map.of("properties", parser)));
+                SettingsBuilderException.class, () -> 
build(source("settings.properties", ""), List.of(parser)));
         assertTrue(error.getMessage().contains("Non-readable settings 
settings.properties"));
         verify(parser).parse(any(), any());
     }
@@ -360,7 +353,7 @@ void xmlStreamIsClosedAfterReadFailure() throws Exception {
             streams.add(stream);
             return stream;
         });
-        assertThrows(SettingsBuilderException.class, () -> build(source, 
Map.of()));
+        assertThrows(SettingsBuilderException.class, () -> build(source, 
List.of()));
         assertFalse(streams.isEmpty());
         for (InputStream stream : streams) {
             verify(stream).close();
@@ -370,6 +363,7 @@ void xmlStreamIsClosedAfterReadFailure() throws Exception {
     @Test
     void formatsShareInterpolationAndMergePrecedence() throws Exception {
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any()))
                 .thenAnswer(call -> ((Source) 
call.getArgument(0)).getLocation().endsWith(".custom"));
         when(parser.parse(any(), any()))
@@ -379,7 +373,7 @@ void formatsShareInterpolationAndMergePrecedence() throws 
Exception {
                                 .username("${account}")
                                 .build()))
                         .build());
-        var result = builder(Map.of("custom", parser))
+        var result = builder(List.of(parser))
                 .build(SettingsBuilderRequest.builder()
                         .session(mock(Session.class))
                         .installationSettingsSource(source(
@@ -400,9 +394,10 @@ void formatsShareInterpolationAndMergePrecedence() throws 
Exception {
     @Test
     void projectSettingsRestrictionsApplyToCustomParser() throws Exception {
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any())).thenReturn(true);
         when(parser.parse(any(), 
any())).thenReturn(Settings.newInstance().withOffline(true));
-        var result = builder(Map.of("custom", parser))
+        var result = builder(List.of(parser))
                 .build(SettingsBuilderRequest.builder()
                         .session(mock(Session.class))
                         .projectSettingsSource(source("project.custom", ""))
@@ -413,7 +408,7 @@ void projectSettingsRestrictionsApplyToCustomParser() 
throws Exception {
 
     @Test
     void projectSettingsCannotWidenServerCredentialOrigins() throws Exception {
-        var result = builder(Map.of())
+        var result = builder(List.of())
                 .build(SettingsBuilderRequest.builder()
                         .session(mock(Session.class))
                         .userSettingsSource(source(
@@ -443,6 +438,7 @@ void projectSettingsCannotWidenServerCredentialOrigins() 
throws Exception {
     void customSettingsDecryptionFailureDoesNotExposeCredentials() throws 
Exception {
         String encrypted = 
"{L6L/HbmrY+cH+sNkphn-corrupted-q3fguYepTpM04WlIXb8nB1pk=}";
         SettingsParser parser = mock(SettingsParser.class);
+        when(parser.id()).thenReturn("parser");
         when(parser.supports(any())).thenReturn(true);
         when(parser.parse(any(), any()))
                 .thenReturn(Settings.newBuilder()
@@ -462,7 +458,7 @@ void 
customSettingsDecryptionFailureDoesNotExposeCredentials() throws Exception
                 new DefaultSettingsXmlFactory(),
                 new DefaultInterpolator(),
                 Map.of("test", mock(Dispatcher.class)),
-                Map.of("custom", parser));
+                List.of(parser));
         var request = SettingsBuilderRequest.builder()
                 .session(session)
                 .userSettingsSource(source("settings.custom", ""))
@@ -491,7 +487,7 @@ void nativeContainerWithoutCustomParsersUsesXml() throws 
Exception {
     }
 
     @Test
-    void unnamedParserWorksInNativeContainer() throws Exception {
+    void parserWorksInNativeContainer() throws Exception {
         Injector injector = Injector.create()
                 .bindInstance(SettingsXmlFactory.class, new 
DefaultSettingsXmlFactory())
                 .bindInstance(Interpolator.class, new DefaultInterpolator())
@@ -509,17 +505,21 @@ void unnamedParserWorksInNativeContainer() throws 
Exception {
     }
 
     @Test
-    void unnamedParserConflictIsReported() throws Exception {
-        var parsers = new HashMap<String, SettingsParser>();
-        parsers.put(null, new PropertiesSettingsParser());
-        parsers.put("properties", new PropertiesSettingsParser());
-        var error =
-                assertThrows(SettingsBuilderException.class, () -> 
build(source("settings.properties", ""), parsers));
+    void parserConflictIsReported() throws Exception {
+        var parser1 = mock(SettingsParser.class);
+        var parser2 = mock(SettingsParser.class);
+        when(parser1.id()).thenReturn("parser-a");
+        when(parser1.supports(any())).thenReturn(true);
+        when(parser2.id()).thenReturn("parser-b");
+        when(parser2.supports(any())).thenReturn(true);
+        var error = assertThrows(
+                SettingsBuilderException.class,
+                () -> build(source("settings.properties", ""), 
List.of(parser1, parser2)));
         var fatal = error.getProblemCollector()
                 .problems(BuilderProblem.Severity.FATAL)
                 .findFirst()
                 .orElseThrow();
-        assertEquals("Multiple settings parsers support this source: 
<unnamed>, properties", fatal.getMessage());
+        assertEquals("Multiple settings parsers support this source: parser-a, 
parser-b", fatal.getMessage());
     }
 
     private String propertiesSettings() throws IOException {
@@ -531,12 +531,12 @@ private String propertiesSettings() throws IOException {
         return output.toString(StandardCharsets.ISO_8859_1);
     }
 
-    private DefaultSettingsBuilder builder(Map<String, SettingsParser> 
parsers) {
+    private DefaultSettingsBuilder builder(List<SettingsParser> parsers) {
         return new DefaultSettingsBuilder(
                 new DefaultSettingsXmlFactory(), new DefaultInterpolator(), 
Map.of(), parsers);
     }
 
-    private SettingsBuilderResult build(Source source, Map<String, 
SettingsParser> parsers) {
+    private SettingsBuilderResult build(Source source, List<SettingsParser> 
parsers) {
         return builder(parsers)
                 .build(SettingsBuilderRequest.builder()
                         .session(mock(Session.class))
@@ -553,6 +553,11 @@ private Source source(String location, String content) 
throws IOException {
     }
 
     private static class PropertiesSettingsParser implements SettingsParser {
+        @Override
+        public String id() {
+            return "properties";
+        }
+
         @Override
         public boolean supports(Source source) {
             return source.getLocation().endsWith(".properties");
diff --git 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelProcessorTest.java
 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelProcessorTest.java
index 5fdba9ecbe..575b62886c 100644
--- 
a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelProcessorTest.java
+++ 
b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelProcessorTest.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -64,11 +65,13 @@ void testDetailedErrorMessageWithMultipleParsers() throws 
IOException {
 
         // Create mock parsers that will fail
         ModelParser yamlParser = mock(ModelParser.class);
+        when(yamlParser.id()).thenReturn("yaml");
         when(yamlParser.locateAndParse(any(), any()))
                 .thenThrow(new ModelParserException(
                         "YAML parsing failed", 5, 10, new 
RuntimeException("Invalid YAML syntax")));
 
         ModelParser tomlParser = mock(ModelParser.class);
+        when(tomlParser.id()).thenReturn("toml");
         when(tomlParser.locateAndParse(any(), any()))
                 .thenThrow(new ModelParserException("TOML parsing failed", 3, 
7, null));
 
@@ -78,8 +81,7 @@ void testDetailedErrorMessageWithMultipleParsers() throws 
IOException {
                 .thenThrow(new XmlReaderException("XML parsing failed", null, 
null));
 
         // Create processor with the mock parsers
-        DefaultModelProcessor processor =
-                new DefaultModelProcessor(xmlFactory, Map.of("yaml", 
yamlParser, "toml", tomlParser));
+        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, List.of(yamlParser, tomlParser));
 
         // Execute and verify
         ModelParserException exception = assertThrows(
@@ -111,13 +113,14 @@ void testDetailedErrorMessageWithSingleParser() throws 
IOException {
         Files.writeString(pomFile, "{invalid json}");
 
         ModelParser jsonParser = mock(ModelParser.class);
+        when(jsonParser.id()).thenReturn("json");
         when(jsonParser.locateAndParse(any(), any())).thenThrow(new 
ModelParserException("JSON parsing failed"));
 
         ModelXmlFactory xmlFactory = mock(ModelXmlFactory.class);
         when(xmlFactory.read(any(XmlReaderRequest.class)))
                 .thenThrow(new XmlReaderException("Not valid XML", null, 
null));
 
-        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, Map.of("json", jsonParser));
+        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, List.of(jsonParser));
 
         ModelParserException exception = assertThrows(
                 ModelParserException.class,
@@ -138,11 +141,12 @@ void testSuccessfulParsingDoesNotThrowException() throws 
Exception {
         when(mockModel.withPomFile(any())).thenReturn(mockModel);
 
         ModelParser yamlParser = mock(ModelParser.class);
+        when(yamlParser.id()).thenReturn("yaml");
         when(yamlParser.locateAndParse(any(), 
any())).thenReturn(Optional.of(mockModel));
 
         ModelXmlFactory xmlFactory = mock(ModelXmlFactory.class);
 
-        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, Map.of("yaml", yamlParser));
+        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, List.of(yamlParser));
 
         Model result = processor.read(Sources.fromPath(pomFile), 
Map.of(ModelParser.STRICT, true));
         assertNotNull(result);
@@ -164,6 +168,11 @@ void 
testParserLocatingProjectDirectoryIsInvokedForDirectorySource() throws Exce
                 .build();
         AtomicInteger parseCalls = new AtomicInteger();
         ModelParser parser = new ModelParser() {
+            @Override
+            public String id() {
+                return "test";
+            }
+
             @Override
             public Optional<Source> locate(Path dir) {
                 return Files.isRegularFile(dir.resolve("META-INF/MANIFEST.MF"))
@@ -181,7 +190,7 @@ public Model parse(Source source, Map<String, ?> options) {
         ModelXmlFactory xmlFactory = mock(ModelXmlFactory.class);
         when(xmlFactory.read(any(XmlReaderRequest.class)))
                 .thenThrow(new XmlReaderException("Is a directory", null, 
null));
-        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, Map.of("manifest", parser));
+        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, List.of(parser));
 
         Path located = processor.locateExistingPom(projectDir);
         assertEquals(projectDir, located);
@@ -210,7 +219,7 @@ void testDeprecatedReadDelegatesToNewRead() throws 
Exception {
         ModelXmlFactory xmlFactory = mock(ModelXmlFactory.class);
         
when(xmlFactory.read(any(XmlReaderRequest.class))).thenReturn(mockModel);
 
-        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, Map.of());
+        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, List.of());
         XmlReaderRequest request =
                 XmlReaderRequest.builder().path(pomFile).strict(true).build();
 
@@ -235,7 +244,7 @@ void testDeprecatedReadPassesTransformer() throws Exception 
{
         ModelXmlFactory xmlFactory = mock(ModelXmlFactory.class);
         
when(xmlFactory.read(any(XmlReaderRequest.class))).thenReturn(mockModel);
 
-        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, Map.of());
+        DefaultModelProcessor processor = new 
DefaultModelProcessor(xmlFactory, List.of());
         XmlReaderRequest.Transformer transformer = 
mock(XmlReaderRequest.Transformer.class);
         XmlReaderRequest request = XmlReaderRequest.builder()
                 .path(pomFile)
diff --git 
a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java
 
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java
index 97734358db..b3ebb226aa 100644
--- 
a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java
+++ 
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java
@@ -1148,7 +1148,7 @@ public final ModelBuilder getModelBuilder() {
 
     protected ModelBuilder createModelBuilder() {
         // from maven-model-builder
-        DefaultModelProcessor modelProcessor = new DefaultModelProcessor(new 
DefaultModelXmlFactory(), Map.of());
+        DefaultModelProcessor modelProcessor = new DefaultModelProcessor(new 
DefaultModelXmlFactory(), List.of());
         return new DefaultModelBuilder(
                 modelProcessor,
                 new DefaultModelValidator(),
diff --git 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
index b5cc442001..aae2240b23 100644
--- 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
+++ 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
@@ -39,6 +39,7 @@ void testAlternativeSyntax() throws Exception {
         Path testDir = extractResources("mng-7836-alternative-pom-syntax");
 
         final Verifier pluginVerifier = 
newVerifier(testDir.resolve("maven-hocon-extension"));
+        pluginVerifier.addCliArgument("-DmavenVersion=" + 
pluginVerifier.getMavenVersion());
         pluginVerifier.addCliArgument("clean");
         pluginVerifier.addCliArgument("install");
         pluginVerifier.addCliArgument("-V");
diff --git 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java
 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java
index fb2495bae2..db210894ca 100644
--- 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java
+++ 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java
@@ -37,6 +37,7 @@ public void testitModel() throws Exception {
         Path testDir = extractResources("mng-8220-extension-with-di");
 
         Verifier verifier = newVerifier(testDir.resolve("extensions"));
+        verifier.addCliArgument("-DmavenVersion=" + 
verifier.getMavenVersion());
         verifier.addCliArgument("install");
         verifier.execute();
         verifier.verifyErrorFreeLog();
diff --git 
a/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/pom.xml
 
b/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/pom.xml
index a493fefc0d..7d22c357ac 100644
--- 
a/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/pom.xml
+++ 
b/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/pom.xml
@@ -35,13 +35,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-api-spi</artifactId>
-      <version>4.0.0-alpha-8</version>
+      <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-api-core</artifactId>
-      <version>4.0.0-alpha-8</version>
+      <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git 
a/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/src/main/java/org/apache/maven/hocon/HoconModelReader.java
 
b/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/src/main/java/org/apache/maven/hocon/HoconModelReader.java
index 0a7e55b25f..2a4bbe76cc 100644
--- 
a/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/src/main/java/org/apache/maven/hocon/HoconModelReader.java
+++ 
b/its/core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/src/main/java/org/apache/maven/hocon/HoconModelReader.java
@@ -41,6 +41,11 @@
 @Priority(1)
 public class HoconModelReader implements ModelParser {
 
+    @Override
+    public String id() {
+        return "hocon";
+    }
+
     @Override
     public Optional<Source> locate(Path path) {
         Path pom = Files.isDirectory(path) ? path.resolve("pom.hocon") : path;
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml
index c9a04440bf..e817874635 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml
@@ -24,6 +24,12 @@ under the License.
   <packaging>jar</packaging>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-api-spi</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-api-di</artifactId>
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/src/main/java/org/apache/maven/its/mng8220/extension1/DumbModelParser1.java
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/src/main/java/org/apache/maven/its/mng8220/extension1/DumbModelParser1.java
index 8ff8319aa9..e1feab2527 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/src/main/java/org/apache/maven/its/mng8220/extension1/DumbModelParser1.java
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/src/main/java/org/apache/maven/its/mng8220/extension1/DumbModelParser1.java
@@ -41,6 +41,11 @@ final class DumbModelParser1 implements ModelParser {
     @Inject
     public DumbModelParser1() {}
 
+    @Override
+    public String id() {
+        return "dumb1";
+    }
+
     @Override
     public Optional<Source> locate(Path dir) {
         logger.warn("[MNG-8220] DumbModelParser1 Called from extension");
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml
index fe30147d85..2e6547814b 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml
@@ -24,6 +24,12 @@ under the License.
   <packaging>jar</packaging>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-api-spi</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-api-di</artifactId>
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/src/main/java/org/apache/maven/its/mng8220/extension2/DumbModelParser2.java
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/src/main/java/org/apache/maven/its/mng8220/extension2/DumbModelParser2.java
index b8872c2b0c..9ee575cb50 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/src/main/java/org/apache/maven/its/mng8220/extension2/DumbModelParser2.java
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/src/main/java/org/apache/maven/its/mng8220/extension2/DumbModelParser2.java
@@ -39,6 +39,11 @@ final class DumbModelParser2 implements ModelParser {
     @Inject
     public DumbModelParser2() {}
 
+    @Override
+    public String id() {
+        return "dumb2";
+    }
+
     @Override
     public Optional<Source> locate(Path dir) {
         logger.warn("[MNG-8220] DumbModelParser2 Called from extension");
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml
index 9863e5096f..783a198789 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml
@@ -27,7 +27,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-api-spi</artifactId>
-      <version>4.0.0-beta-3</version>
+      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/src/main/java/org/apache/maven/its/mng8220/extension3/DumbModelParser3.java
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/src/main/java/org/apache/maven/its/mng8220/extension3/DumbModelParser3.java
index df35c55686..2be23f95b8 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/src/main/java/org/apache/maven/its/mng8220/extension3/DumbModelParser3.java
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/src/main/java/org/apache/maven/its/mng8220/extension3/DumbModelParser3.java
@@ -40,6 +40,11 @@ final class DumbModelParser3 implements ModelParser {
     @Inject
     public DumbModelParser3() {}
 
+    @Override
+    public String id() {
+        return "dumb3";
+    }
+
     @Override
     public Optional<Source> locate(Path dir) {
         logger.warn("[MNG-8220] DumbModelParser3 Called from extension");
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml
index 7f1c50f0dd..63dfa65434 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml
@@ -27,7 +27,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-api-spi</artifactId>
-      <version>4.0.0-beta-3</version>
+      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/src/main/java/org/apache/maven/its/mng8220/extension4/DumbModelParser4.java
 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/src/main/java/org/apache/maven/its/mng8220/extension4/DumbModelParser4.java
index a0471cec3b..0bc6e87f69 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/src/main/java/org/apache/maven/its/mng8220/extension4/DumbModelParser4.java
+++ 
b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/src/main/java/org/apache/maven/its/mng8220/extension4/DumbModelParser4.java
@@ -42,6 +42,11 @@ final class DumbModelParser4 implements ModelParser {
     @Inject
     public DumbModelParser4() {}
 
+    @Override
+    public String id() {
+        return "dumb4";
+    }
+
     @Override
     public Optional<Source> locate(Path dir) {
         logger.warn("[MNG-8220] DumbModelParser4 Called from extension");
diff --git 
a/its/core-it-suite/src/test/resources/mng-8655-settings-parser/extension/src/main/java/org/apache/maven/its/mng8655/PropertiesSettingsParser.java
 
b/its/core-it-suite/src/test/resources/mng-8655-settings-parser/extension/src/main/java/org/apache/maven/its/mng8655/PropertiesSettingsParser.java
index 374d85daeb..7d3c53c743 100644
--- 
a/its/core-it-suite/src/test/resources/mng-8655-settings-parser/extension/src/main/java/org/apache/maven/its/mng8655/PropertiesSettingsParser.java
+++ 
b/its/core-it-suite/src/test/resources/mng-8655-settings-parser/extension/src/main/java/org/apache/maven/its/mng8655/PropertiesSettingsParser.java
@@ -38,6 +38,11 @@ public class PropertiesSettingsParser implements 
SettingsParser {
     @Inject
     public PropertiesSettingsParser() {}
 
+    @Override
+    public String id() {
+        return "properties";
+    }
+
     @Override
     public boolean supports(Source source) {
         return source.getLocation().endsWith(".properties");

Reply via email to