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

[MSHARED-1008] Set builder id in proper way #33

Merged
merged 1 commit into from
Dec 29, 2021
Merged

[MSHARED-1008] Set builder id in proper way #33

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,11 +717,11 @@ enum CheckSumPolicy
InvocationRequest setResumeFrom( String resumeFrom );

/**
* The id of the build strategy to use. equivalent of {@code --builder id}. <b>Note. This is available since Maven
* 3.2.1</b>
* The id of the build strategy to use. equivalent of {@code -b id} or {@code --builder id}.
* <b>Note. This is available since Maven 3.2.1</b>
*
* @param id The builder id.
* @return {@link InvocationRequest} FIXME: How to identify if this is a valid command line option?
* @return {@link InvocationRequest}
* @since 3.0.0
*/
InvocationRequest setBuilder( String id );
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,7 @@ else if ( CheckSumPolicy.Warn.equals( checksumPolicy ) )

if ( request.getBuilder() != null )
{
cli.createArg().setValue( "-b" );
cli.createArg().setValue( request.getBuilder() );
}

Expand Down
8 changes: 8 additions & 0 deletions src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,14 @@ public void testDebugOptionShouldMaskShowErrorsOption()
assertArgumentsNotPresent( cli, Collections.singleton( "-e" ) );
}

@Test
public void testShouldSetBuilderIdOptionsFromRequest()
{
mclb.setFlags( newRequest().setBuilder( "builder-id-123" ), cli );

assertArgumentsPresentInOrder( cli, "-b", "builder-id-123" );
}

@Test
public void testAlsoMake()
{
Expand Down