commit 5925e3d8fdc52e3ad58d7fd35d679277f763a8bf
author tibordigana <tibordigana@apache.org> Sun May 31 15:09:16 2020 +0200
committer tibordigana <tibordigana@apache.org> Sun May 31 15:09:16 2020 +0200
tree 1e95966a91067b6a66ab4bcca27ef9682d74eeca
parent 6237868c88dfd6edc805982747d61094b3b79c25

providerJpmsArguments are already controlled by isMainDescriptor in ProviderInfo

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
index 16e8905..8d4d84c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
@@ -207,21 +207,21 @@
             }
             else
             {
-                for ( String[] entries : providerJpmsArguments )
-                {
-                    for ( String entry : entries )
-                    {
-                        args.append( entry )
-                            .append( NL );
-                    }
-                }
-
                 args.append( "--add-modules" )
                     .append( NL )
                     .append( moduleName )
                     .append( NL );
             }
 
+            for ( String[] entries : providerJpmsArguments )
+            {
+                for ( String entry : entries )
+                {
+                    args.append( entry )
+                        .append( NL );
+                }
+            }
+
             args.append( startClassName );
 
             String argsFileContent = args.toString();