Skip to content

[MNG-7112] --projects flag should honor --non-recursive flag #459

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

Closed
wants to merge 4 commits into from
Closed

[MNG-7112] --projects flag should honor --non-recursive flag #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42237b4
[MNG-7112] Do not select child modules when --non-recursive is given …
MartinKanters Mar 22, 2021
65edbc2
[MNG-7112] Added testcase for excluding aggregator projects non-recur…
MartinKanters Mar 22, 2021
d2d8e1f
[MNG-7112] Clean up checking whether any project selections have been…
MartinKanters Mar 22, 2021
4765573
[MNG-7112] Renamed parameters and methods around the recursive flag a…
MartinKanters Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,9 @@ public void deactivateOptionalProject( String selector )
{
this.activations.add( new ProjectActivationSettings( selector, ActivationSettings.DEACTIVATION_OPTIONAL ) );
}

public boolean isEmpty()
{
return this.activations.isEmpty();
}
}
2 changes: 1 addition & 1 deletion maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private Set<MavenProject> getProjectsBySelectors( MavenExecutionRequest request,
selectedProjects.add( selectedProject );

List<MavenProject> children = selectedProject.getCollectedProjects();
if ( children != null )
if ( children != null && request.isRecursive() )
{
selectedProjects.addAll( children );
}
Expand Down
5 changes: 3 additions & 2 deletions maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ public List<MavenProject> selectProjects( List<File> files, MavenExecutionReques
{
ProjectBuildingRequest projectBuildingRequest = request.getProjectBuildingRequest();

List<ProjectBuildingResult> results = projectBuilder.build( files, request.isRecursive(),
projectBuildingRequest );
boolean hasProjectSelection = !request.getProjectActivation().isEmpty();
boolean isRecursive = hasProjectSelection || request.isRecursive();
List<ProjectBuildingResult> results = projectBuilder.build( files, isRecursive, projectBuildingRequest );

List<MavenProject> projects = new ArrayList<>( results.size() );

Expand Down
23 changes: 20 additions & 3 deletions maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,13 @@ public static Stream<Arguments> parameters()
scenario( "Selected project" )
.activeRequiredProjects( MODULE_B )
.expectResult( MODULE_B ),
scenario( "Selected project (including child modules)" )
scenario( "Selected aggregator project (including child modules)" )
.activeRequiredProjects( MODULE_C )
.expectResult( MODULE_C, MODULE_C_1, MODULE_C_2 ),
scenario( "Selected aggregator project with non-recursive" )
.activeRequiredProjects( MODULE_C )
.nonRecursive()
.expectResult( MODULE_C ),
scenario( "Selected optional project" )
.activeOptionalProjects( MODULE_B )
.expectResult( MODULE_B ),
Expand All @@ -143,6 +147,10 @@ public static Stream<Arguments> parameters()
.inactiveOptionalProjects( "non-existing-module" )
.inactiveRequiredProjects( MODULE_B )
.expectResult( PARENT_MODULE, MODULE_C, MODULE_C_1, MODULE_A, MODULE_C_2, INDEPENDENT_MODULE ),
scenario( "Excluded aggregator project with non-recursive" )
.inactiveRequiredProjects( MODULE_C )
.nonRecursive()
.expectResult( PARENT_MODULE, MODULE_C_1, MODULE_A, MODULE_B, MODULE_C_2, INDEPENDENT_MODULE ),
scenario( "Selected and excluded same project" )
.activeRequiredProjects( MODULE_A )
.inactiveRequiredProjects( MODULE_A )
Expand Down Expand Up @@ -263,7 +271,8 @@ void testGetReactorProjects(
String parameterResumeFrom,
String parameterMakeBehavior,
ExpectedResult parameterExpectedResult,
File parameterRequestedPom)
File parameterRequestedPom,
boolean parameterRecursive )
{
// Given
ProjectActivation projectActivation = new ProjectActivation();
Expand All @@ -275,6 +284,7 @@ void testGetReactorProjects(
when( mavenExecutionRequest.getProjectActivation() ).thenReturn( projectActivation );
when( mavenExecutionRequest.getMakeBehavior() ).thenReturn( parameterMakeBehavior );
when( mavenExecutionRequest.getPom() ).thenReturn( parameterRequestedPom );
when( mavenExecutionRequest.isRecursive() ).thenReturn( parameterRecursive );
if ( StringUtils.isNotEmpty( parameterResumeFrom ) )
{
when( mavenExecutionRequest.getResumeFrom() ).thenReturn( ":" + parameterResumeFrom );
Expand Down Expand Up @@ -394,6 +404,7 @@ static class ScenarioBuilder
private String resumeFrom = "";
private String makeBehavior = "";
private File requestedPom = new File( PARENT_MODULE, "pom.xml" );
private boolean recursive = true;

private ScenarioBuilder() { }

Expand Down Expand Up @@ -446,6 +457,12 @@ public ScenarioBuilder requestedPom( String requestedPom )
return this;
}

public ScenarioBuilder nonRecursive()
{
this.recursive = false;
return this;
}

public Arguments expectResult( String... expectedReactorProjects )
{
ExpectedResult expectedResult = new SelectedProjectsResult( asList( expectedReactorProjects ) );
Expand All @@ -462,7 +479,7 @@ private Arguments createTestArguments( ExpectedResult expectedResult )
{
return Arguments.arguments( description, activeRequiredProjects, activeOptionalProjects,
inactiveRequiredProjects, inactiveOptionalProjects, resumeFrom, makeBehavior, expectedResult,
requestedPom );
requestedPom, recursive );
}

private List<String> prependWithColonIfNeeded( String[] selectors )
Expand Down