From 165d73ea6b6454320ec0efc842970ce7cf441290 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Wed, 30 May 2012 19:52:53 +0400
Subject: [PATCH] IDEA-86814 Maven 3  do not support '-cpu / -npu' options

---
 .../idea/maven/execution/MavenExecutionOptions.java    |  3 ++-
 .../idea/maven/project/MavenGeneralConfigurable.form   | 10 ++++++++++
 .../idea/maven/project/MavenGeneralSettings.java       |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExecutionOptions.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExecutionOptions.java
index 0d616495925a..f73798ff17cc 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExecutionOptions.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExecutionOptions.java
@@ -115,7 +115,8 @@ public class MavenExecutionOptions {
 
   public enum PluginUpdatePolicy {
     UPDATE("Check For Updates", "--check-plugin-updates", MavenServerSettings.UpdatePolicy.ALWAYS_UPDATE),
-    DO_NOT_UPDATE("Do Not Update", "--no-plugin-updates", MavenServerSettings.UpdatePolicy.DO_NOT_UPDATE);
+    DO_NOT_UPDATE("Do Not Update", "--no-plugin-updates", MavenServerSettings.UpdatePolicy.DO_NOT_UPDATE),
+    DEFAULT("Default", "", MavenServerSettings.UpdatePolicy.DO_NOT_UPDATE);
 
     private final String myDisplayString;
     private final String myCommandLineOption;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form
index be990e83b828..f2eff28c8b7e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form
@@ -137,6 +137,16 @@
         </constraints>
         <properties/>
       </component>
+      <component id="902e5" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="8" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font style="2"/>
+          <foreground awt-color="gray"/>
+          <text value="ignored by Maven 3+"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java
index bf4c5721423b..7a1354483c95 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java
@@ -47,7 +47,7 @@ public class MavenGeneralSettings implements Cloneable {
   private MavenExecutionOptions.ChecksumPolicy checksumPolicy = MavenExecutionOptions.ChecksumPolicy.FAIL;
   private MavenExecutionOptions.FailureMode failureBehavior = MavenExecutionOptions.FailureMode.FAST;
   private MavenExecutionOptions.SnapshotUpdatePolicy snapshotUpdatePolicy = MavenExecutionOptions.SnapshotUpdatePolicy.ALWAYS_UPDATE;
-  private MavenExecutionOptions.PluginUpdatePolicy pluginUpdatePolicy = MavenExecutionOptions.PluginUpdatePolicy.DO_NOT_UPDATE;
+  private MavenExecutionOptions.PluginUpdatePolicy pluginUpdatePolicy = MavenExecutionOptions.PluginUpdatePolicy.DEFAULT;
 
   private File myEffectiveLocalRepositoryCache;
   private Set<String> myDefaultPluginsCache;