[maven] branch MNG-7664 created (now 38fc24b79)

[hb...@apache.org]

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

hboutemy pushed a change to branch MNG-7664
in repository https://gitbox.apache.org/repos/asf/maven.git


      at 38fc24b79 [MNG-7664] remove unintended differences

This branch includes the following new commits:

     new 38fc24b79 [MNG-7664] remove unintended differences

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

[maven] 01/01: [MNG-7664] remove unintended differences

[hb...@apache.org]

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

hboutemy pushed a commit to branch MNG-7664
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 38fc24b79a997f4a9c5e5915e30f32be7ce6ec88
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Jan 9 23:35:37 2023 +0100

    [MNG-7664] remove unintended differences
---
 maven-model/src/main/mdo/common.vm | 2 +-
 maven-model/src/main/mdo/merger.vm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/maven-model/src/main/mdo/common.vm b/maven-model/src/main/mdo/common.vm
index 3c3f29cf7..e300b2289 100644
--- a/maven-model/src/main/mdo/common.vm
+++ b/maven-model/src/main/mdo/common.vm
@@ -20,7 +20,7 @@
 ##
 ## The following loop code is required in order to change the type of the
 ## pomFile attribute to a java.nio.file.Path.  Modello does not support this
-## type and loading a model with such a type would fail the modello validation.
+## type and loading a model with such a type would fail the Modello validation.
 ##
 #foreach ( $field in $model.getClass("Model", $version).allFields )
   #if ( $field.name == "pomFile" )
diff --git a/maven-model/src/main/mdo/merger.vm b/maven-model/src/main/mdo/merger.vm
index 2cf9da482..57d4fab0c 100644
--- a/maven-model/src/main/mdo/merger.vm
+++ b/maven-model/src/main/mdo/merger.vm
@@ -38,7 +38,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Objects;
 import java.util.function.BinaryOperator;
 import java.util.function.Function;