[MNG-8331] Sometimes versioned dependencies disappear

jjkester · jjkester · commit 0e4401ab8b71 · 2024-10-18T20:52:05.000+02:00
Ensure all dependencies end up in the model
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
@@ -564,8 +564,7 @@ public void mergeRepositories(List<Repository> toAdd, boolean replace) {
         // Infer inner reactor dependencies version
         //
         Model transformFileToRaw(Model model) {
-            List<Dependency> newDeps = new ArrayList<>();
-            boolean modified = false;
+            List<Dependency> newDeps = new ArrayList<>(model.getDependencies().size());
             for (Dependency dep : model.getDependencies()) {
                 if (dep.getVersion() == null) {
                     Dependency.Builder depBuilder = null;
@@ -591,13 +590,14 @@ Model transformFileToRaw(Model model) {
                     }
                     if (depBuilder != null) {
                         newDeps.add(depBuilder.build());
-                        modified = true;
                     } else {
                         newDeps.add(dep);
                     }
+                } else {
+                    newDeps.add(dep);
                 }
             }
-            return modified ? model.withDependencies(newDeps) : model;
+            return model.withDependencies(newDeps);
         }
 
         String replaceCiFriendlyVersion(Map<String, String> properties, String version) {

Original file line number	Diff line number	Diff line change
`@@ -564,8 +564,7 @@ public void mergeRepositories(List<Repository> toAdd, boolean replace) {`
`564`	`564`	`// Infer inner reactor dependencies version`
`565`	`565`	`//`
`566`	`566`	`Model transformFileToRaw(Model model) {`
`567`		`- List<Dependency> newDeps = new ArrayList<>();`
`568`		`- boolean modified = false;`
	`567`	`+ List<Dependency> newDeps = new ArrayList<>(model.getDependencies().size());`
`569`	`568`	`for (Dependency dep : model.getDependencies()) {`
`570`	`569`	`if (dep.getVersion() == null) {`
`571`	`570`	`Dependency.Builder depBuilder = null;`
`@@ -591,13 +590,14 @@ Model transformFileToRaw(Model model) {`
`591`	`590`	`}`
`592`	`591`	`if (depBuilder != null) {`
`593`	`592`	`newDeps.add(depBuilder.build());`
`594`		`- modified = true;`
`595`	`593`	`} else {`
`596`	`594`	`newDeps.add(dep);`
`597`	`595`	`}`
	`596`	`+ } else {`
	`597`	`+ newDeps.add(dep);`
`598`	`598`	`}`
`599`	`599`	`}`
`600`		`- return modified ? model.withDependencies(newDeps) : model;`
	`600`	`+ return model.withDependencies(newDeps);`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`String replaceCiFriendlyVersion(Map<String, String> properties, String version) {`