You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/12/27 16:34:49 UTC
[maven] branch MNG-6533-2 updated (efd8164 -> 7132f8b)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-6533-2
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard efd8164 [MNG-6533] ProjectBuilder report ModelProblem instead of Exception
discard c41962a [MNG-6533] Prefer passing the interim project in ProjectBuildingResult
discard 184c78d [MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
new a62be1e refactoring: reduced try/catch scope
new 1aeb878 [MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
new ac3680c [MNG-6533] Prefer passing the interim project in ProjectBuildingResult
new 7132f8b [MNG-6533] ProjectBuilder report ModelProblem instead of Exception
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (efd8164)
\
N -- N -- N refs/heads/MNG-6533-2 (7132f8b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 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.
Summary of changes:
[maven] 04/04: [MNG-6533] ProjectBuilder report ModelProblem
instead of Exception
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6533-2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7132f8b1d774934b51becbd8367785cfafd04b76
Author: Mickael Istria <mi...@redhat.com>
AuthorDate: Fri Nov 30 11:28:03 2018 +0100
[MNG-6533] ProjectBuilder report ModelProblem instead of Exception
Sending ModelProblems allows to keep processing other pom files.
---
.../maven/project/DefaultProjectBuilder.java | 22 +++++++++++++++---
.../apache/maven/project/ProjectBuilderTest.java | 26 ++++++++++++++++++++++
maven-core/src/test/resources/projects/badPom.xml | 8 +++++++
3 files changed, 53 insertions(+), 3 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
index 5e8626a..8710f8b 100644
--- 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 @@ public class DefaultProjectBuilder
}
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 );
@@ -596,7 +604,15 @@ public class DefaultProjectBuilder
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
index d954fb3..e52c9ce 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -166,4 +166,30 @@ public class ProjectBuilderTest
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 );
+
+ // multi projects build entry point
+ 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
new file mode 100644
index 0000000..219ae94
--- /dev/null
+++ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ some garbage maven project builder can't parse
+
+</project>
[maven] 02/04: [MNG-6533] Test: ProjectBuildingException miss
reference to MavenProject
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6533-2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1aeb878c2528abb591503f5042032e0446338aba
Author: Mickael Istria <mi...@redhat.com>
AuthorDate: Thu Nov 29 18:26:46 2018 +0100
[MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
---
.../apache/maven/project/ProjectBuilderTest.java | 40 ++++++++++++++++++++++
.../resources/projects/artifactMissingVersion.xml | 34 ++++++++++++++++++
2 files changed, 74 insertions(+)
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
index 18f22bd..d954fb3 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.building.FileModelSource;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelSource;
public class ProjectBuilderTest
@@ -126,4 +127,43 @@ public class ProjectBuilderTest
assertEquals( 0, mavenProject.getArtifacts().size() );
}
+ 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.setRepositorySession( mavenSession.getRepositorySession() );
+ org.apache.maven.project.ProjectBuilder projectBuilder =
+ lookup( org.apache.maven.project.ProjectBuilder.class );
+
+ // single project build entry point
+ try
+ {
+ projectBuilder.build( pomFile, configuration );
+ }
+ catch ( ProjectBuildingException ex )
+ {
+ assertEquals( 1, ex.getResults().size() );
+ MavenProject project = ex.getResults().get( 0 ).getProject();
+ assertNotNull( project );
+ assertEquals( "testArtifactMissingVersion", project.getArtifactId() );
+ assertEquals( pomFile, project.getFile() );
+ }
+
+ // multi projects build entry point
+ 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 );
+ assertEquals( "testArtifactMissingVersion", project.getArtifactId() );
+ assertEquals( pomFile, project.getFile() );
+ }
+ }
}
diff --git a/maven-core/src/test/resources/projects/artifactMissingVersion.xml b/maven-core/src/test/resources/projects/artifactMissingVersion.xml
new file mode 100644
index 0000000..b87aa28
--- /dev/null
+++ b/maven-core/src/test/resources/projects/artifactMissingVersion.xml
@@ -0,0 +1,34 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>markerTest</groupId>
+ <artifactId>testArtifactMissingVersion</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>missing</groupId>
+ <artifactId>missing</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
[maven] 03/04: [MNG-6533] Prefer passing the interim project in
ProjectBuildingResult
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6533-2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ac3680c5a8339b6dd2590653210263c52db4a550
Author: Mickael Istria <mi...@redhat.com>
AuthorDate: Thu Nov 29 22:21:29 2018 +0100
[MNG-6533] Prefer passing the interim project in ProjectBuildingResult
Initialize the interim project with "simple" items (ie do not build
not reference parent if it's not yet in the projectIndex) and returns
it when installation fails further.
This give a partial validation of the file, pretty convenient in IDEs.
---
.../maven/project/DefaultProjectBuilder.java | 46 ++++++++++++++++------
1 file changed, 33 insertions(+), 13 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
index 0e9c56d..5e8626a 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -172,8 +172,8 @@ public class DefaultProjectBuilder
modelProblems = result.getProblems();
- initProject( project, Collections.<String, MavenProject>emptyMap(), result,
- new HashMap<File, Boolean>(), projectBuildingRequest );
+ initProject( project, Collections.<String, MavenProject>emptyMap(), true,
+ result, new HashMap<File, Boolean>(), projectBuildingRequest );
}
else if ( projectBuildingRequest.isResolveDependencies() )
{
@@ -418,6 +418,7 @@ public class DefaultProjectBuilder
ModelBuildingRequest request = getModelBuildingRequest( config );
MavenProject project = new MavenProject();
+ project.setFile( pomFile );
request.setPomFile( pomFile );
request.setTwoPhaseBuilding( true );
@@ -434,12 +435,21 @@ public class DefaultProjectBuilder
}
catch ( ModelBuildingException e )
{
- results.add( new DefaultProjectBuildingResult( e.getModelId(), pomFile, e.getProblems() ) );
+ result = e.getResult();
+ if ( result == null || result.getEffectiveModel() == null )
+ {
+ results.add( new DefaultProjectBuildingResult( e.getModelId(), pomFile, e.getProblems() ) );
- return false;
+ return false;
+ }
+ // validation error, continue project building and delay failing to help IDEs
+ // result.getProblems().addAll(e.getProblems()) ?
+ noErrors = false;
}
Model model = result.getEffectiveModel();
+ // first pass: build without building parent.
+ initProject( project, projectIndex, false, result, new HashMap<File, Boolean>( 0 ), config.request );
projectIndex.put( result.getModelIds().get( 0 ), project );
@@ -580,12 +590,13 @@ public class DefaultProjectBuilder
for ( InterimResult interimResult : interimResults )
{
+ MavenProject project = interimResult.listener.getProject();
try
{
ModelBuildingResult result = modelBuilder.build( interimResult.request, interimResult.result );
- MavenProject project = interimResult.listener.getProject();
- initProject( project, projectIndex, result, profilesXmls, request );
+ // 2nd pass of initialization: resolve and build parent if necessary
+ initProject( project, projectIndex, true, result, profilesXmls, request );
List<MavenProject> modules = new ArrayList<>();
noErrors =
@@ -607,8 +618,16 @@ public class DefaultProjectBuilder
}
catch ( ModelBuildingException e )
{
- results.add( new DefaultProjectBuildingResult( e.getModelId(), interimResult.pomFile,
- e.getProblems() ) );
+ DefaultProjectBuildingResult result = null;
+ if ( project == null )
+ {
+ result = new DefaultProjectBuildingResult( e.getModelId(), interimResult.pomFile, e.getProblems() );
+ }
+ else
+ {
+ result = new DefaultProjectBuildingResult( project, e.getProblems(), null );
+ }
+ results.add( result );
noErrors = false;
}
@@ -618,7 +637,8 @@ public class DefaultProjectBuilder
}
@SuppressWarnings( "checkstyle:methodlength" )
- private void initProject( MavenProject project, Map<String, MavenProject> projects, ModelBuildingResult result,
+ private void initProject( MavenProject project, Map<String, MavenProject> projects,
+ boolean buildParentIfNotExisting, ModelBuildingResult result,
Map<File, Boolean> profilesXmls, ProjectBuildingRequest projectBuildingRequest )
{
Model model = result.getEffectiveModel();
@@ -627,7 +647,7 @@ public class DefaultProjectBuilder
project.setOriginalModel( result.getRawModel() );
project.setFile( model.getPomFile() );
- initParent( project, projects, result, projectBuildingRequest );
+ initParent( project, projects, buildParentIfNotExisting, result, projectBuildingRequest );
Artifact projectArtifact =
repositorySystem.createArtifact( project.getGroupId(), project.getArtifactId(), project.getVersion(), null,
@@ -804,8 +824,8 @@ public class DefaultProjectBuilder
}
}
- private void initParent( MavenProject project, Map<String, MavenProject> projects, ModelBuildingResult result,
- ProjectBuildingRequest projectBuildingRequest )
+ private void initParent( MavenProject project, Map<String, MavenProject> projects, boolean buildParentIfNotExisting,
+ ModelBuildingResult result, ProjectBuildingRequest projectBuildingRequest )
{
Model parentModel = result.getModelIds().size() > 1 && !result.getModelIds().get( 1 ).isEmpty()
? result.getRawModel( result.getModelIds().get( 1 ) )
@@ -824,7 +844,7 @@ public class DefaultProjectBuilder
String parentModelId = result.getModelIds().get( 1 );
File parentPomFile = result.getRawModel( parentModelId ).getPomFile();
MavenProject parent = projects.get( parentModelId );
- if ( parent == null )
+ if ( parent == null && buildParentIfNotExisting )
{
//
// At this point the DefaultModelBuildingListener has fired and it populates the
[maven] 01/04: refactoring: reduced try/catch scope
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6533-2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a62be1e61164fc3aec59d8d2e4d13396717743d0
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Dec 27 17:25:27 2018 +0100
refactoring: reduced try/catch scope
---
.../maven/project/DefaultProjectBuilder.java | 143 +++++++++++----------
1 file changed, 72 insertions(+), 71 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
index 0d2887b..0e9c56d 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -427,106 +427,107 @@ public class DefaultProjectBuilder
new DefaultModelBuildingListener( project, projectBuildingHelper, config.request );
request.setModelBuildingListener( listener );
+ ModelBuildingResult result;
try
{
- ModelBuildingResult result = modelBuilder.build( request );
+ result = modelBuilder.build( request );
+ }
+ catch ( ModelBuildingException e )
+ {
+ results.add( new DefaultProjectBuildingResult( e.getModelId(), pomFile, e.getProblems() ) );
- Model model = result.getEffectiveModel();
+ return false;
+ }
- projectIndex.put( result.getModelIds().get( 0 ), project );
+ Model model = result.getEffectiveModel();
- InterimResult interimResult = new InterimResult( pomFile, request, result, listener, isRoot );
- interimResults.add( interimResult );
+ projectIndex.put( result.getModelIds().get( 0 ), project );
- if ( recursive && !model.getModules().isEmpty() )
- {
- File basedir = pomFile.getParentFile();
+ InterimResult interimResult = new InterimResult( pomFile, request, result, listener, isRoot );
+ interimResults.add( interimResult );
+
+ if ( recursive && !model.getModules().isEmpty() )
+ {
+ File basedir = pomFile.getParentFile();
- List<File> moduleFiles = new ArrayList<>();
+ List<File> moduleFiles = new ArrayList<>();
- for ( String module : model.getModules() )
+ for ( String module : model.getModules() )
+ {
+ if ( StringUtils.isEmpty( module ) )
{
- if ( StringUtils.isEmpty( module ) )
- {
- continue;
- }
+ continue;
+ }
- module = module.replace( '\\', File.separatorChar ).replace( '/', File.separatorChar );
+ module = module.replace( '\\', File.separatorChar ).replace( '/', File.separatorChar );
- File moduleFile = new File( basedir, module );
+ File moduleFile = new File( basedir, module );
- if ( moduleFile.isDirectory() )
- {
- moduleFile = modelProcessor.locatePom( moduleFile );
- }
+ if ( moduleFile.isDirectory() )
+ {
+ moduleFile = modelProcessor.locatePom( moduleFile );
+ }
- if ( !moduleFile.isFile() )
- {
- ModelProblem problem =
- new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile
- + " does not exist", ModelProblem.Severity.ERROR, ModelProblem.Version.BASE, model, -1,
- -1, null );
- result.getProblems().add( problem );
+ if ( !moduleFile.isFile() )
+ {
+ ModelProblem problem =
+ new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile
+ + " does not exist", ModelProblem.Severity.ERROR, ModelProblem.Version.BASE, model, -1,
+ -1, null );
+ result.getProblems().add( problem );
- noErrors = false;
+ noErrors = false;
- continue;
- }
+ continue;
+ }
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+ {
+ // we don't canonicalize on unix to avoid interfering with symlinks
+ try
{
- // we don't canonicalize on unix to avoid interfering with symlinks
- try
- {
- moduleFile = moduleFile.getCanonicalFile();
- }
- catch ( IOException e )
- {
- moduleFile = moduleFile.getAbsoluteFile();
- }
+ moduleFile = moduleFile.getCanonicalFile();
}
- else
+ catch ( IOException e )
{
- moduleFile = new File( moduleFile.toURI().normalize() );
+ moduleFile = moduleFile.getAbsoluteFile();
}
+ }
+ else
+ {
+ moduleFile = new File( moduleFile.toURI().normalize() );
+ }
- if ( aggregatorFiles.contains( moduleFile ) )
+ if ( aggregatorFiles.contains( moduleFile ) )
+ {
+ StringBuilder buffer = new StringBuilder( 256 );
+ for ( File aggregatorFile : aggregatorFiles )
{
- StringBuilder buffer = new StringBuilder( 256 );
- for ( File aggregatorFile : aggregatorFiles )
- {
- buffer.append( aggregatorFile ).append( " -> " );
- }
- buffer.append( moduleFile );
-
- ModelProblem problem =
- new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile
- + " forms aggregation cycle " + buffer, ModelProblem.Severity.ERROR,
- ModelProblem.Version.BASE, model, -1, -1, null );
- result.getProblems().add( problem );
-
- noErrors = false;
-
- continue;
+ buffer.append( aggregatorFile ).append( " -> " );
}
+ buffer.append( moduleFile );
- moduleFiles.add( moduleFile );
- }
-
- interimResult.modules = new ArrayList<>();
+ ModelProblem problem =
+ new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile
+ + " forms aggregation cycle " + buffer, ModelProblem.Severity.ERROR,
+ ModelProblem.Version.BASE, model, -1, -1, null );
+ result.getProblems().add( problem );
- if ( !build( results, interimResult.modules, projectIndex, moduleFiles, aggregatorFiles, false,
- recursive, config ) )
- {
noErrors = false;
+
+ continue;
}
+
+ moduleFiles.add( moduleFile );
}
- }
- catch ( ModelBuildingException e )
- {
- results.add( new DefaultProjectBuildingResult( e.getModelId(), pomFile, e.getProblems() ) );
- noErrors = false;
+ interimResult.modules = new ArrayList<>();
+
+ if ( !build( results, interimResult.modules, projectIndex, moduleFiles, aggregatorFiles, false,
+ recursive, config ) )
+ {
+ noErrors = false;
+ }
}
return noErrors;