diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerEmbedder.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerEmbedder.java')
-rw-r--r-- | plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerEmbedder.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerEmbedder.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerEmbedder.java index 0c4be99814c1..6b3db15e7035 100644 --- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerEmbedder.java +++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerEmbedder.java @@ -34,12 +34,15 @@ public interface MavenServerEmbedder extends Remote { @NotNull MavenServerExecutionResult resolveProject(@NotNull File file, - @NotNull Collection<String> activeProfiles) throws RemoteException, - MavenServerProcessCanceledException; + @NotNull Collection<String> activeProfiles, + @NotNull Collection<String> inactiveProfiles) throws RemoteException, + MavenServerProcessCanceledException; @Nullable - String evaluateEffectivePom(@NotNull File file, @NotNull List<String> activeProfiles) throws RemoteException, - MavenServerProcessCanceledException; + String evaluateEffectivePom(@NotNull File file, + @NotNull List<String> activeProfiles, + @NotNull List<String> inactiveProfiles) throws RemoteException, + MavenServerProcessCanceledException; @NotNull MavenArtifact resolve(@NotNull MavenArtifactInfo info, |