[maven] 01/05: Make DefaultInheritanceAssembler#merger field final and reorder fields correctly

[gnodet]

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

commit 89d3ac90d1c955323b2d909513de5a9e5ff5b133
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Sep 20 16:38:56 2023 +0200

    Make DefaultInheritanceAssembler#merger field final and reorder fields 
correctly
---
 .../apache/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) {