maven: updated internal JB maven mirror URL; honor local repo overriding change by maven server; test local repo metadata added to avoid update request for these artifacts;

plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java

@@ -216,6 +216,7 @@ public class MavenGeneralSettings implements Cloneable {
 
     if (!Comparing.equal(this.overriddenLocalRepository, overridenLocalRepository)) {
       this.overriddenLocalRepository = overridenLocalRepository;
+      MavenServerManager.getInstance().shutdown(true);
       changed();
     }
   }

plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java

@@ -15,6 +15,7 @@
  */
 package org.jetbrains.idea.maven.project;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
@@ -56,7 +57,7 @@ public class MavenWorkspaceSettingsComponent implements PersistentStateComponent
 
   private static void applyDefaults(MavenWorkspaceSettings settings) {
     if(StringUtil.isEmptyOrSpaces(settings.generalSettings.getMavenHome())) {
-      if(MavenServerManager.getInstance().isUsedMaven2ForProjectImport()) {
+      if(MavenServerManager.getInstance().isUsedMaven2ForProjectImport() || ApplicationManager.getApplication().isUnitTestMode()) {
         settings.generalSettings.setMavenHome(MavenServerManager.BUNDLED_MAVEN_2);
       } else {
         settings.generalSettings.setMavenHome(MavenServerManager.BUNDLED_MAVEN_3);

plugins/maven/src/test/data/local1/asm/asm/maven-metadata-central.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>asm</groupId>
+  <artifactId>asm</artifactId>
+  <versioning>
+    <versions>
+      <version>3.3</version>
+      <version>3.3.1</version>
+    </versions>
+  </versioning>
+</metadata>

plugins/maven/src/test/data/local1/commons-io/commons-io/maven-metadata-central.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>commons-io</groupId>
+  <artifactId>commons-io</artifactId>
+  <versioning>
+    <versions>
+      <version>2.4</version>
+    </versions>
+  </versioning>
+</metadata>

plugins/maven/src/test/data/local1/junit/junit/maven-metadata-central.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>junit</groupId>
+  <artifactId>junit</artifactId>
+  <versioning>
+    <versions>
+      <version>3.8.1</version>
+      <version>3.8.2</version>
+      <version>4.0</version>
+    </versions>
+  </versioning>
+</metadata>

plugins/maven/src/test/data/local1/org/ow2/asm/asm/maven-metadata-central.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm</artifactId>
+  <versioning>
+    <versions>
+      <version>4.1</version>
+    </versions>
+  </versioning>
+</metadata>

plugins/maven/src/test/data/local2/jmock/jmock/maven-metadata-central.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>jmock</groupId>
+  <artifactId>jmock</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0.0</version>
+      <version>1.1.0</version>
+      <version>1.2.0</version>
+    </versions>
+  </versioning>
+</metadata>

plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java

@@ -325,14 +325,14 @@ public abstract class MavenTestCase extends UsefulTestCase {
     String mirror = System.getProperty("idea.maven.test.mirror",
                                        // use JB maven proxy server for internal use by default, see details at
                                        // https://confluence.jetbrains.com/display/JBINT/Maven+proxy+server
-                                       "http://maven.labs.intellij.net/remote-repos/");
+                                       "http://maven.labs.intellij.net/repo");
     return "<settings>" +
            content +
            "<mirrors>" +
            "  <mirror>" +
            "    <id>jb-central-proxy</id>" +
            "    <url>" + mirror + "</url>" +
-           "    <mirrorOf>*</mirrorOf>" +
+           "    <mirrorOf>external:*</mirrorOf>" +
            "  </mirror>" +
            "</mirrors>" +
            "</settings>";

plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.java

@@ -20,11 +20,7 @@ import com.intellij.codeInsight.intention.impl.config.IntentionActionWrapper;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiReference;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.formatter.xml.XmlCodeStyleSettings;
@@ -36,7 +32,6 @@ import org.jetbrains.idea.maven.dom.model.MavenDomDependency;
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;