summaryrefslogtreecommitdiff
path: root/plugins/maven/maven2-server-impl/src/org/jetbrains/maven/embedder/MavenEmbedder.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/maven/maven2-server-impl/src/org/jetbrains/maven/embedder/MavenEmbedder.java')
-rw-r--r--plugins/maven/maven2-server-impl/src/org/jetbrains/maven/embedder/MavenEmbedder.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/maven/maven2-server-impl/src/org/jetbrains/maven/embedder/MavenEmbedder.java b/plugins/maven/maven2-server-impl/src/org/jetbrains/maven/embedder/MavenEmbedder.java
index 3926a3d1f030..70a6e470926c 100644
--- a/plugins/maven/maven2-server-impl/src/org/jetbrains/maven/embedder/MavenEmbedder.java
+++ b/plugins/maven/maven2-server-impl/src/org/jetbrains/maven/embedder/MavenEmbedder.java
@@ -173,15 +173,18 @@ public class MavenEmbedder {
}
@NotNull
- public MavenExecutionResult resolveProject(@NotNull final File file, @NotNull final List<String> activeProfiles) {
- return resolveProject(file, activeProfiles, Collections.<ResolutionListener>emptyList());
+ public MavenExecutionResult resolveProject(@NotNull final File file,
+ @NotNull final List<String> activeProfiles,
+ @NotNull final List<String> inactiveProfiles) {
+ return resolveProject(file, activeProfiles, inactiveProfiles, Collections.<ResolutionListener>emptyList());
}
@NotNull
public MavenExecutionResult resolveProject(@NotNull final File file,
@NotNull final List<String> activeProfiles,
+ @NotNull final List<String> inactiveProfiles,
List<ResolutionListener> listeners) {
- MavenExecutionRequest request = createRequest(file, activeProfiles, Collections.<String>emptyList(), Collections.<String>emptyList());
+ MavenExecutionRequest request = createRequest(file, activeProfiles, inactiveProfiles, Collections.<String>emptyList());
ProjectBuilderConfiguration config = request.getProjectBuilderConfiguration();
request.getGlobalProfileManager().loadSettingsProfiles(mySettings);