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

gnodet pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-4.0.x by this push:
     new 8626a2f775 Report well-formed-but-invalid POMs as invalid, not 
malformed (#13958)
8626a2f775 is described below

commit 8626a2f7750d7919b14482440973ebb59f3ff242
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Nov 12 22:16:35 2026 +0100

    Report well-formed-but-invalid POMs as invalid, not malformed (#13958)
---
 .../maven/model/building/DefaultModelBuilder.java  |  6 ++-
 .../model/building/DefaultModelBuilderTest.java    | 57 ++++++++++++++++++++++
 .../maven/impl/model/DefaultModelBuilder.java      |  4 +-
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git 
a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 
b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 08c0280739..a928f45ed9 100644
--- 
a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ 
b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -702,13 +702,15 @@ private Model readModel(
                     throw e;
                 }
 
+                // the document parsed successfully once unknown/misplaced 
elements were tolerated,
+                // so it is well-formed XML that merely violates the POM 
schema - invalid, not malformed
                 if (pomFile != null) {
                     problems.add(new 
ModelProblemCollectorRequest(Severity.ERROR, Version.V20)
-                            .setMessage("Malformed POM " + 
modelSource.getLocation() + ": " + e.getMessage())
+                            .setMessage("Invalid POM " + 
modelSource.getLocation() + ": " + e.getMessage())
                             .setException(e));
                 } else {
                     problems.add(new 
ModelProblemCollectorRequest(Severity.WARNING, Version.V20)
-                            .setMessage("Malformed POM " + 
modelSource.getLocation() + ": " + e.getMessage())
+                            .setMessage("Invalid POM " + 
modelSource.getLocation() + ": " + e.getMessage())
                             .setException(e));
                 }
             }
diff --git 
a/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
 
b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
index 353c2a1258..eef36589bd 100644
--- 
a/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
+++ 
b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
@@ -37,6 +37,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  */
@@ -97,6 +98,62 @@ public void testCycleInImports() throws Exception {
         assertThrows(ModelBuildingException.class, () -> 
builder.build(request));
     }
 
+    /**
+     * MNG-6864: a well-formed POM that merely has an unrecognized/misplaced 
element is invalid,
+     * not malformed - the "Malformed POM" message is reserved for documents 
that are not
+     * well-formed XML at all.
+     */
+    @Test
+    public void testInvalidPomIsNotReportedAsMalformed() throws Exception {
+        String pom = "<project>\n" + "  <modelVersion>4.0.0</modelVersion>\n"
+                + "  <groupId>thegroup</groupId>\n"
+                + "  <artifactId>invalid</artifactId>\n"
+                + "  <version>1</version>\n"
+                + "  <dependencies>\n"
+                + "    <project>\n"
+                + "    </project>\n"
+                + "  </dependencies>\n"
+                + "</project>\n";
+
+        ModelBuilder builder = new DefaultModelBuilderFactory().newInstance();
+
+        DefaultModelBuildingRequest request = new 
DefaultModelBuildingRequest();
+        request.setModelSource(new StringModelSource(pom));
+
+        ModelBuildingResult result = builder.build(request);
+
+        assertTrue(
+                result.getProblems().stream().anyMatch(p -> 
p.getMessage().startsWith("Invalid POM")),
+                () -> "Expected an \"Invalid POM\" problem, got: " + 
result.getProblems());
+        assertTrue(
+                result.getProblems().stream().noneMatch(p -> 
p.getMessage().startsWith("Malformed POM")),
+                () -> "Did not expect a \"Malformed POM\" problem, got: " + 
result.getProblems());
+    }
+
+    /**
+     * Contrast case for {@link #testInvalidPomIsNotReportedAsMalformed()}: a 
document that is not
+     * well-formed XML at all must still fail outright, unaffected by MNG-6864.
+     */
+    @Test
+    public void testNotWellFormedPomFailsBuild() {
+        String pom = "<project>\n" + "  <modelVersion>4.0.0</modelVersion>\n"
+                + "  <groupId>thegroup</groupId>\n"
+                + "  <artifactId>malformed</artifactId>\n"
+                + "  <version>1</version>\n"
+                + "  <name>mismatched</foo>\n"
+                + "</project>\n";
+
+        ModelBuilder builder = new DefaultModelBuilderFactory().newInstance();
+
+        DefaultModelBuildingRequest request = new 
DefaultModelBuildingRequest();
+        request.setModelSource(new StringModelSource(pom));
+
+        ModelBuildingException e = assertThrows(ModelBuildingException.class, 
() -> builder.build(request));
+        assertTrue(
+                e.getProblems().stream().anyMatch(p -> 
p.getMessage().startsWith("Non-parseable POM")),
+                () -> "Expected a \"Non-parseable POM\" problem, got: " + 
e.getProblems());
+    }
+
     static class CycleInImportsResolver extends BaseModelResolver {
         @Override
         public ModelSource resolveModel(Dependency dependency) throws 
UnresolvableModelException {
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 e59160807f..597b87f00b 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
@@ -1862,10 +1862,12 @@ Model doReadFileModel(Set<Path> activeModelReads) 
throws ModelBuilderException {
                             throw e;
                         }
 
+                        // the document parsed successfully once 
unknown/misplaced elements were tolerated,
+                        // so it is well-formed XML that merely violates the 
POM schema - invalid, not malformed
                         add(
                                 Severity.ERROR,
                                 Version.V20,
-                                "Malformed POM " + modelSource.getLocation() + 
": " + e.getMessage(),
+                                "Invalid POM " + modelSource.getLocation() + 
": " + e.getMessage(),
                                 e);
                     }
                 } catch (XmlReaderException e) {

Reply via email to