[MNG-6533] ProjectBuilder report ModelProblem instead of Exception

Sending ModelProblems allows to keep processing other pom files.
apache · Dec 18, 2018 · 7dbf6a3 · 7dbf6a3
1 parent 51ee05c
commit 7dbf6a3
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 9 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -448,8 +448,16 @@ private boolean build( List<ProjectBuildingResult> results, List<InterimResult>
         }
 
         Model model = result.getEffectiveModel();
-        // first pass: build without building parent.
-        initProject( project, projectIndex, false, result, new HashMap<File, Boolean>( 0 ), config.request );
+        try
+        {
+            // first pass: build without building parent.
+            initProject( project, projectIndex, false, result, new HashMap<File, Boolean>( 0 ), config.request );
+        }
+        catch ( Exception e )
+        {
+            result.getProblems().add( new DefaultModelProblem( null, ModelProblem.Severity.ERROR, null, model, -1, -1,
+                  e ) );
+        }
 
         projectIndex.put( result.getModelIds().get( 0 ), project );
 
@@ -595,7 +603,15 @@ private boolean build( List<ProjectBuildingResult> results, List<MavenProject> p
                 ModelBuildingResult result = modelBuilder.build( interimResult.request, interimResult.result );
 
                 // 2nd pass of initialization: resolve and build parent if necessary
-                initProject( project, projectIndex, true, result, profilesXmls, request );
+                try
+                {
+                    initProject( project, projectIndex, true, result, profilesXmls, request );
+                }
+                catch ( Exception e )
+                {
+                    result.getProblems().add( new DefaultModelProblem( null, ModelProblem.Severity.ERROR, null,
+                            result.getEffectiveModel(), -1, -1, e ) );
+                }
 
                 List<MavenProject> modules = new ArrayList<>();
                 noErrors =

diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -33,7 +33,7 @@ public class ProjectBuilderTest
     extends AbstractCoreMavenComponentTestCase
 {
     @Override
-	protected String getProjectsDirectory()
+    protected String getProjectsDirectory()
     {
         return "src/test/projects/project-builder";
     }
@@ -88,31 +88,53 @@ public void testVersionlessManagedDependency()
         }
     }
 
-    public void testReadErroneousMavenProjectContainsReference() throws Exception
+    public void testReadErroneousMavenProjectContainsReference()
+        throws Exception
     {
         File pomFile = new File( "src/test/resources/projects/artifactMissingVersion.xml" ).getAbsoluteFile();
         MavenSession mavenSession = createMavenSession( null );
         ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
-        configuration.setValidationLevel(ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL);
+        configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
         configuration.setRepositorySession( mavenSession.getRepositorySession() );
         org.apache.maven.project.ProjectBuilder projectBuilder = lookup( org.apache.maven.project.ProjectBuilder.class );
         try {
             projectBuilder.build( pomFile, configuration );
         } catch ( ProjectBuildingException ex ) {
             assertEquals( 1, ex.getResults().size() );
-            MavenProject project = ex.getResults().get(0).getProject();
+            MavenProject project = ex.getResults().get( 0 ).getProject();
             assertNotNull( project );
             assertEquals( "testArtifactMissingVersion", project.getArtifactId() );
             assertEquals( pomFile, project.getFile() );
         }
         try {
             projectBuilder.build( Collections.singletonList( pomFile ), false, configuration );
         } catch ( ProjectBuildingException ex ) {
-        	assertEquals( 1, ex.getResults().size() );
-            MavenProject project = ex.getResults().get(0).getProject();
+            assertEquals( 1, ex.getResults().size() );
+            MavenProject project = ex.getResults().get( 0 ).getProject();
             assertNotNull( project );
             assertEquals( "testArtifactMissingVersion", project.getArtifactId() );
             assertEquals( pomFile, project.getFile() );
         }
     }
+
+
+    public void testReadInvalidPom()
+        throws Exception
+    {
+        File pomFile = new File( "src/test/resources/projects/badPom.xml" ).getAbsoluteFile();
+        MavenSession mavenSession = createMavenSession( null );
+        ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
+        configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+        configuration.setRepositorySession( mavenSession.getRepositorySession() );
+        org.apache.maven.project.ProjectBuilder projectBuilder = lookup( org.apache.maven.project.ProjectBuilder.class );
+        try {
+            projectBuilder.build( Collections.singletonList( pomFile ), false, configuration );
+        } catch ( ProjectBuildingException ex ) {
+            assertEquals( 1, ex.getResults().size() );
+            MavenProject project = ex.getResults().get( 0 ).getProject();
+            assertNotNull( project );
+            assertNotSame( 0, ex.getResults().get( 0 ).getProblems().size() );
+        }
+    }
+
 }
diff --git a/maven-core/src/test/resources/projects/badPom.xml b/maven-core/src/test/resources/projects/badPom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  some garbage maven project builder can't parse
+
+</project>