From ea64ab20b89c334b4f85c0e218261e2e9b5514cc Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Wed, 10 Oct 2012 15:11:50 +0400 Subject: [PATCH] Don't process plugins from build.getPluginManagement() --- .../maven/server/MavenModelConverter.java | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java index 8ff4b1119633..d8515fe944cb 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java @@ -231,25 +231,19 @@ public class MavenModelConverter { List result = new ArrayList(); Set pluginKeys = new THashSet(); Build build = mavenModel.getBuild(); - doConvertPlugins(build, false, result, pluginKeys); - if (build != null) doConvertPlugins(build.getPluginManagement(), true, result, pluginKeys); - return result; - } - private static void doConvertPlugins(PluginContainer container, - boolean management, - List result, - Set pluginKeys) throws RemoteException { - if (container == null) return; - - List plugins = container.getPlugins(); - if (plugins == null) return; - - for (Plugin each : plugins) { - String key = each.getGroupId() + ":" + each.getArtifactId(); - result.add(convertPlugin(management, each)); - pluginKeys.add(key); + if (build != null) { + List plugins = build.getPlugins(); + if (plugins != null) { + for (Plugin each : plugins) { + String key = each.getGroupId() + ":" + each.getArtifactId(); + result.add(convertPlugin(false, each)); + pluginKeys.add(key); + } + } } + + return result; } private static MavenPlugin convertPlugin(boolean isDefault, Plugin plugin) throws RemoteException {