From 89d3ac90d1c955323b2d909513de5a9e5ff5b133 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 20 Sep 2023 16:38:56 +0200
Subject: [PATCH] Make DefaultInheritanceAssembler#merger field final and
 reorder fields correctly

---
 .../maven/model/inheritance/DefaultInheritanceAssembler.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index e165491094..0a3e36f04e 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -47,12 +47,12 @@ import org.apache.maven.model.merge.MavenModelMerger;
 @Singleton
 public class DefaultInheritanceAssembler implements InheritanceAssembler {
 
-    private InheritanceModelMerger merger = new InheritanceModelMerger();
-
     private static final String CHILD_DIRECTORY = "child-directory";
 
     private static final String CHILD_DIRECTORY_PROPERTY = "project.directory";
 
+    private final InheritanceModelMerger merger = new InheritanceModelMerger();
+
     @Override
     public Model assembleModelInheritance(
             Model child, Model parent, ModelBuildingRequest request, ModelProblemCollector problems) {