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/07/26 23:12:08 UTC

(maven) 01/01: [MNG-8507] Optimize model building pipeline: builder-passing SPI + interpolation fast paths

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

gnodet pushed a commit to branch perf/wrapper-properties-on2
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 8ce7d21078379e2de744507fe2d61cdaa34f6780
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 01:11:39 2026 +0200

    [MNG-8507] Optimize model building pipeline: builder-passing SPI + interpolation fast paths
    
    Reduce unnecessary object allocations in the model building pipeline:
    
    - SPI methods (ModelNormalizer, ModelPathTranslator, ModelUrlNormalizer,
      PluginManagementInjector, DependencyManagementInjector,
      PluginConfigurationExpander) now accept a Model.Builder parameter,
      allowing the caller to share a single builder across multiple pipeline
      steps and reduce intermediate Model object allocations.
    
    - MavenTransformer: add indexOf('$') fast-path in transform(String) to
      skip the entire interpolation callback chain for strings that cannot
      contain variable references (the vast majority in a typical model).
    
    - DefaultInterpolator.unescape: add fast-path to return immediately when
      the string contains neither escape markers nor escape characters.
    
    - ReflectionValueExtractor: make accessor prefix list a static constant
      to avoid creating a new ArrayList on every getPropertyValue() call.
    
    - DefaultModelBuilder.buildEffectiveModel: combine adjacent SPI steps
      into shared builder scopes (path translation + plugin management in one
      build, default values + plugin configuration in another) to reduce the
      total number of Model.build() calls per module.
    
    Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
 .../model/DependencyManagementInjector.java        |  7 ++--
 .../maven/api/services/model/ModelNormalizer.java  | 12 ++++---
 .../api/services/model/ModelPathTranslator.java    |  5 +--
 .../api/services/model/ModelUrlNormalizer.java     |  5 +--
 .../model/PluginConfigurationExpander.java         |  6 ++--
 .../services/model/PluginManagementInjector.java   |  7 ++--
 .../maven/impl/DefaultModelUrlNormalizer.java      |  7 ++--
 .../impl/DefaultPluginConfigurationExpander.java   |  6 ++--
 .../model/DefaultDependencyManagementInjector.java | 10 +++---
 .../maven/impl/model/DefaultInterpolator.java      |  9 ++++-
 .../maven/impl/model/DefaultModelBuilder.java      | 42 ++++++++++++----------
 .../maven/impl/model/DefaultModelNormalizer.java   | 26 +++++++-------
 .../impl/model/DefaultModelPathTranslator.java     | 23 ++++++------
 .../model/DefaultPluginManagementInjector.java     | 10 +++---
 .../model/reflection/ReflectionValueExtractor.java |  9 +++--
 .../impl/model/DefaultModelPathTranslatorTest.java | 16 ++++++---
 .../apache/maven/testing/plugin/MojoExtension.java | 12 ++++---
 pom.xml                                            |  2 +-
 src/mdo/transformer.vm                             |  8 +++++
 19 files changed, 131 insertions(+), 91 deletions(-)

diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java
index fb91b232cf..2af33e3305 100644
--- a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java
+++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java
@@ -32,10 +32,11 @@ public interface DependencyManagementInjector {
     /**
      * Merges default values from the dependency management section of the given model into itself.
      *
-     * @param model The model into which to merge the values specified by its dependency management sections, must not
-     *            be <code>null</code>.
+     * @param model The model to read from, must not be {@code null}.
+     * @param builder The model builder to write changes to, must not be {@code null}.
      * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    Model injectManagement(Model model, ModelBuilderRequest request, ModelProblemCollector problems);
+    void injectManagement(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems);
 }
diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java
index 50225fd417..d9747d8637 100644
--- a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java
+++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java
@@ -33,19 +33,23 @@ public interface ModelNormalizer {
     /**
      * Merges duplicate elements like multiple declarations of the same build plugin in the specified model.
      *
-     * @param model The model whose duplicate elements should be merged, must not be {@code null}.
+     * @param model The model to read from, must not be {@code null}.
+     * @param builder The model builder to write changes to, must not be {@code null}.
      * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    Model mergeDuplicates(Model model, ModelBuilderRequest request, ModelProblemCollector problems);
+    void mergeDuplicates(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems);
 
     /**
      * Sets default values in the specified model that for technical reasons cannot be set directly in the Modello
      * definition.
      *
-     * @param model The model in which to set the default values, must not be {@code null}.
+     * @param model The model to read from, must not be {@code null}.
+     * @param builder The model builder to write changes to, must not be {@code null}.
      * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    Model injectDefaultValues(Model model, ModelBuilderRequest request, ModelProblemCollector problems);
+    void injectDefaultValues(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems);
 }
diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java
index c2ec4ce522..5fa9c8773c 100644
--- a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java
+++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java
@@ -34,10 +34,11 @@ public interface ModelPathTranslator {
      * Resolves the well-known paths of the specified model against the given base directory. Paths within plugin
      * configuration are not processed.
      *
-     * @param model The model whose paths should be resolved, may be {@code null}.
+     * @param model The model to read from, may be {@code null}.
+     * @param builder The model builder to write changes to, must not be {@code null}.
      * @param basedir The base directory to resolve relative paths against, may be {@code null}.
      * @param request The model building request that holds further settings, must not be {@code null}.
      * @since 4.0.0
      */
-    Model alignToBaseDirectory(Model model, Path basedir, ModelBuilderRequest request);
+    void alignToBaseDirectory(Model model, Model.Builder builder, Path basedir, ModelBuilderRequest request);
 }
diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java
index a216b99d7a..ba21cac394 100644
--- a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java
+++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java
@@ -32,8 +32,9 @@ public interface ModelUrlNormalizer {
     /**
      * Normalizes the well-known URLs of the specified model.
      *
-     * @param model The model whose URLs should be normalized, may be {@code null}.
+     * @param model The model to read from, may be {@code null}.
+     * @param builder The model builder to write changes to, must not be {@code null}.
      * @param request The model building request that holds further settings, must not be {@code null}.
      */
-    Model normalize(Model model, ModelBuilderRequest request);
+    void normalize(Model model, Model.Builder builder, ModelBuilderRequest request);
 }
diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java
index bdd249489d..b23085178a 100644
--- a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java
+++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java
@@ -32,9 +32,11 @@ public interface PluginConfigurationExpander {
     /**
      * Merges values from general build plugin configuration into the individual plugin executions of the given model.
      *
-     * @param model The model whose build plugin configuration should be expanded, must not be <code>null</code>.
+     * @param model The model to read from, must not be {@code null}.
+     * @param builder The model builder to write changes to, must not be {@code null}.
      * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    Model expandPluginConfiguration(Model model, ModelBuilderRequest request, ModelProblemCollector problems);
+    void expandPluginConfiguration(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems);
 }
diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java
index 36d7f7e19f..f8ce01b95e 100644
--- a/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java
+++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java
@@ -32,10 +32,11 @@ public interface PluginManagementInjector {
     /**
      * Merges default values from the plugin management section of the given model into itself.
      *
-     * @param model The model into which to merge the values specified by its plugin management section, must not be
-     *            <code>null</code>.
+     * @param model The model to read from, must not be {@code null}.
+     * @param builder The model builder to write changes to, must not be {@code null}.
      * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    Model injectManagement(Model model, ModelBuilderRequest request, ModelProblemCollector problems);
+    void injectManagement(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems);
 }
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelUrlNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelUrlNormalizer.java
index 36bdb746b5..bf78714158 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelUrlNormalizer.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelUrlNormalizer.java
@@ -46,12 +46,11 @@ public DefaultModelUrlNormalizer(UrlNormalizer urlNormalizer) {
     }
 
     @Override
-    public Model normalize(Model model, ModelBuilderRequest request) {
+    public void normalize(Model model, Model.Builder builder, ModelBuilderRequest request) {
         if (model == null) {
-            return null;
+            return;
         }
 
-        Model.Builder builder = Model.newBuilder(model);
         builder.url(normalize(model.getUrl()));
 
         Scm scm = model.getScm();
@@ -70,8 +69,6 @@ public Model normalize(Model model, ModelBuilderRequest request) {
                 builder.distributionManagement(dist.withSite(site.withUrl(normalize(site.getUrl()))));
             }
         }
-
-        return builder.build();
     }
 
     private String normalize(String url) {
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginConfigurationExpander.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginConfigurationExpander.java
index fc159b8ccd..aeb2a96545 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginConfigurationExpander.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginConfigurationExpander.java
@@ -45,7 +45,8 @@
 public class DefaultPluginConfigurationExpander implements PluginConfigurationExpander {
 
     @Override
-    public Model expandPluginConfiguration(Model model, ModelBuilderRequest request, ModelProblemCollector problems) {
+    public void expandPluginConfiguration(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems) {
         Build build = model.getBuild();
         if (build != null) {
             build = build.withPlugins(expandPlugin(build.getPlugins()));
@@ -54,13 +55,12 @@ public Model expandPluginConfiguration(Model model, ModelBuilderRequest request,
                 build = build.withPluginManagement(
                         pluginManagement.withPlugins(expandPlugin(pluginManagement.getPlugins())));
             }
-            model = model.withBuild(build);
+            builder.build(build);
         }
         Reporting reporting = model.getReporting();
         if (reporting != null) {
             expandReport(reporting.getPlugins());
         }
-        return model.withBuild(build);
     }
 
     private List<Plugin> expandPlugin(List<Plugin> oldPlugins) {
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementInjector.java
index d5c7d5d3e1..747590602b 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementInjector.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementInjector.java
@@ -46,8 +46,9 @@ public class DefaultDependencyManagementInjector implements DependencyManagement
     private ManagementModelMerger merger = new ManagementModelMerger();
 
     @Override
-    public Model injectManagement(Model model, ModelBuilderRequest request, ModelProblemCollector problems) {
-        return merger.mergeManagedDependencies(model);
+    public void injectManagement(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems) {
+        merger.mergeManagedDependencies(model, builder);
     }
 
     /**
@@ -55,7 +56,7 @@ public Model injectManagement(Model model, ModelBuilderRequest request, ModelPro
      */
     protected static class ManagementModelMerger extends MavenModelMerger {
 
-        public Model mergeManagedDependencies(Model model) {
+        public void mergeManagedDependencies(Model model, Model.Builder builder) {
             DependencyManagement dependencyManagement = model.getDependencyManagement();
             if (dependencyManagement != null) {
                 Map<Object, Dependency> dependencies = new HashMap<>();
@@ -86,10 +87,9 @@ public Model mergeManagedDependencies(Model model) {
                         Dependency dependency = dependencies.get(key);
                         newDeps.add(dependency);
                     }
-                    return Model.newBuilder(model).dependencies(newDeps).build();
+                    builder.dependencies(newDeps);
                 }
             }
-            return model;
         }
 
         @Override
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
index 422a800f52..f18a38a7f1 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
@@ -414,7 +414,14 @@ public static String unescape(@Nullable String val) {
         if (val == null || val.isEmpty()) {
             return val;
         }
-        val = val.replace(MARKER, "$");
+        // Fast path: if the string contains neither the escape marker ($__)
+        // nor the escape char (\), there is nothing to unescape.
+        if (val.indexOf(MARKER.charAt(0)) < 0 && val.indexOf(ESCAPE_CHAR) < 0) {
+            return val;
+        }
+        if (val.contains(MARKER)) {
+            val = val.replace(MARKER, "$");
+        }
         int escape = val.indexOf(ESCAPE_CHAR);
         while (escape >= 0 && escape < val.length() - 1) {
             char c = val.charAt(escape + 1);
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 8a80317e79..9270aa8482 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
@@ -976,12 +976,11 @@ void buildEffectiveModel(Collection<String> importIds) throws ModelBuilderExcept
             setSource(resultModel);
             setRootModel(resultModel);
 
-            // model path translation
-            resultModel =
-                    modelPathTranslator.alignToBaseDirectory(resultModel, resultModel.getProjectDirectory(), request);
-
-            // plugin management injection
-            resultModel = pluginManagementInjector.injectManagement(resultModel, request, this);
+            // model path translation + plugin management injection (different fields, shared builder)
+            Model.Builder builder = Model.newBuilder(resultModel);
+            modelPathTranslator.alignToBaseDirectory(resultModel, builder, resultModel.getProjectDirectory(), request);
+            pluginManagementInjector.injectManagement(resultModel, builder, request, this);
+            resultModel = builder.build();
 
             // lifecycle bindings injection
             if (request.getRequestType() != ModelBuilderRequest.RequestType.CONSUMER_DEPENDENCY) {
@@ -996,14 +995,17 @@ void buildEffectiveModel(Collection<String> importIds) throws ModelBuilderExcept
             resultModel = importDependencyManagement(resultModel, importIds);
 
             // dependency management injection
-            resultModel = dependencyManagementInjector.injectManagement(resultModel, request, this);
-
-            resultModel = modelNormalizer.injectDefaultValues(resultModel, request, this);
+            builder = Model.newBuilder(resultModel);
+            dependencyManagementInjector.injectManagement(resultModel, builder, request, this);
+            resultModel = builder.build();
 
+            // default values injection + plugin configuration (different fields, shared builder)
+            builder = Model.newBuilder(resultModel);
+            modelNormalizer.injectDefaultValues(resultModel, builder, request, this);
             if (request.getRequestType() != ModelBuilderRequest.RequestType.CONSUMER_DEPENDENCY) {
-                // plugins configuration
-                resultModel = pluginConfigurationExpander.expandPluginConfiguration(resultModel, request, this);
+                pluginConfigurationExpander.expandPluginConfiguration(resultModel, builder, request, this);
             }
+            resultModel = builder.build();
 
             for (var transformer : transformers) {
                 resultModel = transformer.transformEffectiveModel(resultModel);
@@ -1395,7 +1397,9 @@ Model activateFileModel(Model inputModel) throws ModelBuilderException {
 
             // model normalization
             setSource(inputModel);
-            inputModel = modelNormalizer.mergeDuplicates(inputModel, request, this);
+            Model.Builder mdBuilder = Model.newBuilder(inputModel);
+            modelNormalizer.mergeDuplicates(inputModel, mdBuilder, request, this);
+            inputModel = mdBuilder.build();
 
             List<Activation> interpolatedActivations = getProfileActivations(inputModel);
             inputModel = injectProfileActivations(inputModel, interpolatedActivations);
@@ -1470,7 +1474,9 @@ private Model readEffectiveModel() throws ModelBuilderException {
             }
 
             // model normalization
-            model = modelNormalizer.mergeDuplicates(model, request, this);
+            Model.Builder mdBuilder2 = Model.newBuilder(model);
+            modelNormalizer.mergeDuplicates(model, mdBuilder2, request, this);
+            model = mdBuilder2.build();
 
             // profile activation
             profileActivationContext.setModel(model);
@@ -1493,11 +1499,11 @@ private Model readEffectiveModel() throws ModelBuilderException {
             Model resultModel = model;
             resultModel = interpolateModel(resultModel, request, this);
 
-            // model normalization
-            resultModel = modelNormalizer.mergeDuplicates(resultModel, request, this);
-
-            // url normalization
-            resultModel = modelUrlNormalizer.normalize(resultModel, request);
+            // model normalization + url normalization (different fields, shared builder)
+            Model.Builder normBuilder = Model.newBuilder(resultModel);
+            modelNormalizer.mergeDuplicates(resultModel, normBuilder, request, this);
+            modelUrlNormalizer.normalize(resultModel, normBuilder, request);
+            resultModel = normBuilder.build();
 
             // Now the fully interpolated model is available: reconfigure the resolver
             if (!resultModel.getRepositories().isEmpty()) {
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelNormalizer.java
index f36918f770..dc6934feaa 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelNormalizer.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelNormalizer.java
@@ -46,9 +46,8 @@ public class DefaultModelNormalizer implements ModelNormalizer {
     private DuplicateMerger merger = new DuplicateMerger();
 
     @Override
-    public Model mergeDuplicates(Model model, ModelBuilderRequest request, ModelProblemCollector problems) {
-        Model.Builder builder = Model.newBuilder(model);
-
+    public void mergeDuplicates(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems) {
         Build build = model.getBuild();
         if (build != null) {
             List<Plugin> plugins = build.getPlugins();
@@ -86,8 +85,6 @@ public Model mergeDuplicates(Model model, ModelBuilderRequest request, ModelProb
         if (dependencies.size() != normalized.size()) {
             builder.dependencies(normalized.values());
         }
-
-        return builder.build();
     }
 
     /**
@@ -101,19 +98,20 @@ public Plugin mergePlugin(Plugin target, Plugin source) {
     }
 
     @Override
-    public Model injectDefaultValues(Model model, ModelBuilderRequest request, ModelProblemCollector problems) {
-        Model.Builder builder = Model.newBuilder(model);
+    public void injectDefaultValues(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems) {
+        List<Dependency> newDeps = injectList(model.getDependencies(), this::injectDependency);
+        if (newDeps != null) {
+            builder.dependencies(newDeps);
+        }
 
-        builder.dependencies(injectList(model.getDependencies(), this::injectDependency));
         Build build = model.getBuild();
         if (build != null) {
-            Build newBuild = Build.newBuilder(build)
-                    .plugins(injectList(build.getPlugins(), this::injectPlugin))
-                    .build();
-            builder.build(newBuild != build ? newBuild : null);
+            List<Plugin> newPlugins = injectList(build.getPlugins(), this::injectPlugin);
+            if (newPlugins != null) {
+                builder.build(Build.newBuilder(build).plugins(newPlugins).build());
+            }
         }
-
-        return builder.build();
     }
 
     private Plugin injectPlugin(Plugin p) {
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java
index 52ebbbf9d9..ba3df59c9b 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java
@@ -52,15 +52,14 @@ public DefaultModelPathTranslator(PathTranslator pathTranslator) {
     }
 
     @Override
-    public Model alignToBaseDirectory(Model model, Path basedir, ModelBuilderRequest request) {
+    public void alignToBaseDirectory(Model model, Model.Builder builder, Path basedir, ModelBuilderRequest request) {
         if (model == null || basedir == null) {
-            return model;
+            return;
         }
 
         Build build = model.getBuild();
-        Build newBuild = null;
         if (build != null) {
-            newBuild = Build.newBuilder(build)
+            Build newBuild = Build.newBuilder(build)
                     .sources(map(build.getSources(), this::alignToBaseDirectory, basedir))
                     .directory(alignToBaseDirectory(build.getDirectory(), basedir))
                     .sourceDirectory(alignToBaseDirectory(build.getSourceDirectory(), basedir))
@@ -72,22 +71,20 @@ public Model alignToBaseDirectory(Model model, Path basedir, ModelBuilderRequest
                     .outputDirectory(alignToBaseDirectory(build.getOutputDirectory(), basedir))
                     .testOutputDirectory(alignToBaseDirectory(build.getTestOutputDirectory(), basedir))
                     .build();
+            if (newBuild != build) {
+                builder.build(newBuild);
+            }
         }
 
         Reporting reporting = model.getReporting();
-        Reporting newReporting = null;
         if (reporting != null) {
-            newReporting = Reporting.newBuilder(reporting)
+            Reporting newReporting = Reporting.newBuilder(reporting)
                     .outputDirectory(alignToBaseDirectory(reporting.getOutputDirectory(), basedir))
                     .build();
+            if (newReporting != reporting) {
+                builder.reporting(newReporting);
+            }
         }
-        if (newBuild != build || newReporting != reporting) {
-            model = Model.newBuilder(model)
-                    .build(newBuild)
-                    .reporting(newReporting)
-                    .build();
-        }
-        return model;
     }
 
     /**
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPluginManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPluginManagementInjector.java
index 4f10a4ca1f..e8d7dcd6db 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPluginManagementInjector.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPluginManagementInjector.java
@@ -48,8 +48,9 @@ public class DefaultPluginManagementInjector implements PluginManagementInjector
     private ManagementModelMerger merger = new ManagementModelMerger();
 
     @Override
-    public Model injectManagement(Model model, ModelBuilderRequest request, ModelProblemCollector problems) {
-        return merger.mergeManagedBuildPlugins(model);
+    public void injectManagement(
+            Model model, Model.Builder builder, ModelBuilderRequest request, ModelProblemCollector problems) {
+        merger.mergeManagedBuildPlugins(model, builder);
     }
 
     /**
@@ -57,15 +58,14 @@ public Model injectManagement(Model model, ModelBuilderRequest request, ModelPro
      */
     protected static class ManagementModelMerger extends MavenModelMerger {
 
-        public Model mergeManagedBuildPlugins(Model model) {
+        public void mergeManagedBuildPlugins(Model model, Model.Builder builder) {
             Build build = model.getBuild();
             if (build != null) {
                 PluginManagement pluginManagement = build.getPluginManagement();
                 if (pluginManagement != null) {
-                    return model.withBuild(mergePluginContainerPlugins(build, pluginManagement));
+                    builder.build(mergePluginContainerPlugins(build, pluginManagement));
                 }
             }
-            return model;
         }
 
         private Build mergePluginContainerPlugins(Build target, PluginContainer source) {
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractor.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractor.java
index dc6c8a613e..e5d7a383ee 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractor.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractor.java
@@ -23,7 +23,6 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -42,6 +41,12 @@
 public class ReflectionValueExtractor {
     private static final Object[] OBJECT_ARGS = new Object[0];
 
+    /**
+     * Prefixes tried when resolving a property name to a getter method.
+     * Static to avoid creating a new list on every {@link #getPropertyValue} call.
+     */
+    private static final List<String> ACCESSOR_PREFIXES = List.of("get", "is", "to", "as");
+
     /**
      * Use a WeakHashMap here, so the keys (Class objects) can be garbage collected.
      * This approach prevents permgen space overflows due to retention of discarded
@@ -271,7 +276,7 @@ private static Object getPropertyValue(Object value, String property) throws Int
         ClassMap classMap = getClassMap(value.getClass());
         String methodBase = Character.toTitleCase(property.charAt(0)) + property.substring(1);
         try {
-            for (String prefix : Arrays.asList("get", "is", "to", "as")) {
+            for (String prefix : ACCESSOR_PREFIXES) {
                 Method method = classMap.findMethod(prefix + methodBase);
                 if (method != null) {
                     return method.invoke(value, OBJECT_ARGS);
diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelPathTranslatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelPathTranslatorTest.java
index be71eff2d5..2fb6421ece 100644
--- a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelPathTranslatorTest.java
+++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelPathTranslatorTest.java
@@ -48,7 +48,9 @@ void sourceDirectoryIsAlignedToBasedir() {
                 .build(Build.newBuilder().sources(java.util.List.of(source)).build())
                 .build();
 
-        Model result = translator.alignToBaseDirectory(model, basedir, null);
+        Model.Builder builder = Model.newBuilder(model);
+        translator.alignToBaseDirectory(model, builder, basedir, null);
+        Model result = builder.build();
 
         String dir = result.getBuild().getSources().get(0).getDirectory();
         assertTrue(Path.of(dir).isAbsolute(), "directory should be absolute after alignment");
@@ -65,7 +67,9 @@ void sourceTargetPathIsNotAlignedToBasedir() {
                 .build(Build.newBuilder().sources(java.util.List.of(source)).build())
                 .build();
 
-        Model result = translator.alignToBaseDirectory(model, basedir, null);
+        Model.Builder builder = Model.newBuilder(model);
+        translator.alignToBaseDirectory(model, builder, basedir, null);
+        Model result = builder.build();
 
         String targetPath = result.getBuild().getSources().get(0).getTargetPath();
         assertEquals("META-INF/resources", targetPath, "targetPath should remain relative");
@@ -81,7 +85,9 @@ void sourceTargetPathDotPrefixRemainsRelative() {
                 .build(Build.newBuilder().sources(java.util.List.of(source)).build())
                 .build();
 
-        Model result = translator.alignToBaseDirectory(model, basedir, null);
+        Model.Builder builder = Model.newBuilder(model);
+        translator.alignToBaseDirectory(model, builder, basedir, null);
+        Model result = builder.build();
 
         String targetPath = result.getBuild().getSources().get(0).getTargetPath();
         assertEquals(".grammar", targetPath, "dot-prefixed targetPath should remain relative");
@@ -97,7 +103,9 @@ void resourceDirectoryIsAlignedButTargetPathIsNot() {
                 .build(Build.newBuilder().resources(java.util.List.of(resource)).build())
                 .build();
 
-        Model result = translator.alignToBaseDirectory(model, basedir, null);
+        Model.Builder builder = Model.newBuilder(model);
+        translator.alignToBaseDirectory(model, builder, basedir, null);
+        Model result = builder.build();
 
         Resource aligned = result.getBuild().getResources().get(0);
         assertTrue(
diff --git a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
index 59f2144ffc..5b6c8b5dfb 100644
--- a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
+++ b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
@@ -243,8 +243,10 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
                     try (Reader r = openPomUrl(holder, pom, new Path[1])) {
                         Model localModel = new MavenStaxReader().read(r);
                         model = new MavenMerger().merge(localModel, model, false, null);
-                        model = new DefaultModelPathTranslator(new DefaultPathTranslator())
-                                .alignToBaseDirectory(model, Paths.get(getBasedir()), null);
+                        Model.Builder pathBuilder = Model.newBuilder(model);
+                        new DefaultModelPathTranslator(new DefaultPathTranslator())
+                                .alignToBaseDirectory(model, pathBuilder, Paths.get(getBasedir()), null);
+                        model = pathBuilder.build();
                     }
                 }
                 goal = parameterInjectMojo.goal();
@@ -437,8 +439,10 @@ public void beforeEach(ExtensionContext context) throws Exception {
         } else {
             model = new MavenMerger().merge(tmodel, defaultModel, false, null);
         }
-        final Model alignedModel = new DefaultModelPathTranslator(new DefaultPathTranslator())
-                .alignToBaseDirectory(model, Paths.get(getBasedir()), null);
+        Model.Builder alignBuilder = Model.newBuilder(model);
+        new DefaultModelPathTranslator(new DefaultPathTranslator())
+                .alignToBaseDirectory(model, alignBuilder, Paths.get(getBasedir()), null);
+        final Model alignedModel = alignBuilder.build();
         context.getStore(MOJO_EXTENSION).put(Model.class, alignedModel);
 
         // mojo execution
diff --git a/pom.xml b/pom.xml
index 83c795caf1..4098b8771a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@ under the License.
     <plexusInterpolationVersion>1.29</plexusInterpolationVersion>
     <plexusTestingVersion>2.1.0</plexusTestingVersion>
     <plexusXmlVersion>4.1.1</plexusXmlVersion>
-    <resolverVersion>2.0.21-SNAPSHOT</resolverVersion>
+    <resolverVersion>2.0.21</resolverVersion>
     <securityDispatcherVersion>4.1.0</securityDispatcherVersion>
     <sisuVersion>1.0.1</sisuVersion>
     <slf4jVersion>2.0.18</slf4jVersion>
diff --git a/src/mdo/transformer.vm b/src/mdo/transformer.vm
index 05cc200e03..9d111191df 100644
--- a/src/mdo/transformer.vm
+++ b/src/mdo/transformer.vm
@@ -71,6 +71,14 @@ public class ${className} {
      * The transformation function.
      */
     protected String transform(String value) {
+        // Fast path: skip the callback entirely when the string cannot
+        // contain a variable reference. This avoids the entire interpolation
+        // call chain (lambda invocation, substVars, HashSet allocation,
+        // delimiter scanning, unescape) for the vast majority of strings
+        // in a typical model (only a handful use ${...} placeholders).
+        if (value == null || value.indexOf('$') < 0) {
+            return value;
+        }
         return transformer.apply(value);
     }