[maven-invoker] branch master updated: [MSHARED-1008] Set builder id in proper way

[sjaranowski]

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-invoker.git


The following commit(s) were added to refs/heads/master by this push:
     new 2a1e609  [MSHARED-1008] Set builder id in proper way
2a1e609 is described below

commit 2a1e609e87c8903cff74f636a352ddf4d41c3b42
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Wed Dec 29 13:26:34 2021 +0100

    [MSHARED-1008] Set builder id in proper way
---
 .../java/org/apache/maven/shared/invoker/InvocationRequest.java   | 6 +++---
 .../org/apache/maven/shared/invoker/MavenCommandLineBuilder.java  | 1 +
 .../apache/maven/shared/invoker/MavenCommandLineBuilderTest.java  | 8 ++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java 
b/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
index d65af9a..91c98d3 100644
--- a/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
+++ b/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
@@ -717,11 +717,11 @@ public interface InvocationRequest
     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 );
diff --git 
a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java 
b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
index d4aee47..205ed05 100644
--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
@@ -573,6 +573,7 @@ public class MavenCommandLineBuilder
 
         if ( request.getBuilder() != null )
         {
+            cli.createArg().setValue( "-b" );
             cli.createArg().setValue( request.getBuilder() );
         }
 
diff --git 
a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
 
b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
index 90cd25e..32fcdc6 100644
--- 
a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
+++ 
b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
@@ -346,6 +346,14 @@ public class MavenCommandLineBuilderTest
     }
 
     @Test
+    public void testShouldSetBuilderIdOptionsFromRequest()
+    {
+        mclb.setFlags( newRequest().setBuilder( "builder-id-123" ), cli );
+
+        assertArgumentsPresentInOrder( cli, "-b", "builder-id-123" );
+    }
+
+    @Test
     public void testAlsoMake()
     {