Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MNG-6529 - ProjectBuild.build(projectsList, ...) ignores request.isResolveDependencies() #193

Merged
merged 1 commit into from Dec 26, 2018
Merged

MNG-6529 - ProjectBuild.build(projectsList, ...) ignores request.isResolveDependencies() #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
View file
Open in desktop
Expand Up @@ -371,7 +371,7 @@ public List<ProjectBuildingResult> build( List<File> pomFiles, boolean recursive
{
noErrors =
build( results, new ArrayList<MavenProject>(), projectIndex, interimResults, request,
new HashMap<File, Boolean>() ) && noErrors;
new HashMap<File, Boolean>(), config.session ) && noErrors;
}
finally
{
Expand Down Expand Up @@ -572,7 +572,8 @@ private void populateReactorModelPool( ReactorModelPool reactorModelPool, List<I

private boolean build( List<ProjectBuildingResult> results, List<MavenProject> projects,
Map<String, MavenProject> projectIndex, List<InterimResult> interimResults,
ProjectBuildingRequest request, Map<File, Boolean> profilesXmls )
ProjectBuildingRequest request, Map<File, Boolean> profilesXmls,
RepositorySystemSession session )
{
boolean noErrors = true;

Expand All @@ -587,15 +588,21 @@ private boolean build( List<ProjectBuildingResult> results, List<MavenProject> p

List<MavenProject> modules = new ArrayList<>();
noErrors =
build( results, modules, projectIndex, interimResult.modules, request, profilesXmls ) && noErrors;
build( results, modules, projectIndex, interimResult.modules, request, profilesXmls, session )
&& noErrors;

projects.addAll( modules );
projects.add( project );

project.setExecutionRoot( interimResult.root );
project.setCollectedProjects( modules );
DependencyResolutionResult resolutionResult = null;
if ( request.isResolveDependencies() )
{
resolutionResult = resolveDependencies( project, session );
}

results.add( new DefaultProjectBuildingResult( project, result.getProblems(), null ) );
results.add( new DefaultProjectBuildingResult( project, result.getProblems(), resolutionResult ) );
}
catch ( ModelBuildingException e )
{
Expand Down
42 changes: 42 additions & 0 deletions maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
View file
Open in desktop
Expand Up @@ -20,6 +20,8 @@
*/

import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Properties;

import org.apache.maven.AbstractCoreMavenComponentTestCase;
Expand All @@ -30,6 +32,7 @@
public class ProjectBuilderTest
extends AbstractCoreMavenComponentTestCase
{
@Override
protected String getProjectsDirectory()
{
return "src/test/projects/project-builder";
Expand Down Expand Up @@ -84,4 +87,43 @@ public void testVersionlessManagedDependency()
// this is expected
}
}

public void testResolveDependencies()
throws Exception
{
File pomFile = new File( "src/test/resources/projects/basic-resolveDependencies.xml" );
MavenSession mavenSession = createMavenSession( null );
ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
configuration.setRepositorySession( mavenSession.getRepositorySession() );
configuration.setResolveDependencies( true );

// single project build entry point
ProjectBuildingResult result = lookup( org.apache.maven.project.ProjectBuilder.class ).build( pomFile, configuration );
assertEquals( 1, result.getProject().getArtifacts().size() );
// multi projects build entry point
List<ProjectBuildingResult> results = lookup( org.apache.maven.project.ProjectBuilder.class ).build( Collections.singletonList( pomFile ), false, configuration );
assertEquals( 1, results.size() );
MavenProject mavenProject = results.get( 0 ).getProject();
assertEquals( 1, mavenProject.getArtifacts().size() );
}

public void testDontResolveDependencies()
throws Exception
{
File pomFile = new File( "src/test/resources/projects/basic-resolveDependencies.xml" );
MavenSession mavenSession = createMavenSession( null );
ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
configuration.setRepositorySession( mavenSession.getRepositorySession() );
configuration.setResolveDependencies( false );

// single project build entry point
ProjectBuildingResult result = lookup( org.apache.maven.project.ProjectBuilder.class ).build( pomFile, configuration );
assertEquals( 0, result.getProject().getArtifacts().size() );
// multi projects build entry point
List<ProjectBuildingResult> results = lookup( org.apache.maven.project.ProjectBuilder.class ).build( Collections.singletonList( pomFile ), false, configuration );
assertEquals( 1, results.size() );
MavenProject mavenProject = results.get( 0 ).getProject();
assertEquals( 0, mavenProject.getArtifacts().size() );
}

}
15 changes: 15 additions & 0 deletions maven-core/src/test/resources/projects/basic-resolveDependencies.xml
View file
Open in desktop
@@ -0,0 +1,15 @@
<project>
<modelVersion>4.0.0</modelVersion>

<groupId>test</groupId>
<artifactId>basic-resolveDependencies.xml</artifactId>
<version>0.0.1-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>a</artifactId>
<version>0.1</version>
</dependency>
</dependencies>
</project>