Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 8 insertions, 0 deletions

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java
index c04f2d344e51..bca71b2c0d8f 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java
@@ -23,6 +23,7 @@ import com.intellij.util.xmlb.annotations.Transient;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.model.MavenConstants;
+import org.jetbrains.idea.maven.model.MavenExplicitProfiles;
 import org.jetbrains.idea.maven.utils.Path;
 
 import java.io.File;
@@ -53,6 +54,13 @@ public class MavenRunnerParameters implements Cloneable {
   public MavenRunnerParameters(boolean isPomExecution,
                                @NotNull String workingDirPath,
                                @Nullable List<String> goals,
+                               @NotNull MavenExplicitProfiles explicitProfiles) {
+    this(isPomExecution, workingDirPath, goals, explicitProfiles.getEnabledProfiles(), explicitProfiles.getDisabledProfiles());
+  }
+
+  public MavenRunnerParameters(boolean isPomExecution,
+                               @NotNull String workingDirPath,
+                               @Nullable List<String> goals,
                                @Nullable Collection<String> explicitEnabledProfiles,
                                @Nullable Collection<String> explicitDisabledProfiles) {
     this.isPomExecution = isPomExecution;