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 0194cab008ce..85354b0906d9 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 @@ -216,6 +216,7 @@ public class MavenGeneralSettings implements Cloneable { if (!Comparing.equal(this.overriddenLocalRepository, overridenLocalRepository)) { this.overriddenLocalRepository = overridenLocalRepository; + MavenServerManager.getInstance().shutdown(true); changed(); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java index d526fa2629a0..4d8f1b770bd6 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java +++ b/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); diff --git a/plugins/maven/src/test/data/local1/asm/asm/maven-metadata-central.xml b/plugins/maven/src/test/data/local1/asm/asm/maven-metadata-central.xml new file mode 100644 index 000000000000..8167e07ef43c --- /dev/null +++ b/plugins/maven/src/test/data/local1/asm/asm/maven-metadata-central.xml @@ -0,0 +1,11 @@ + + + asm + asm + + + 3.3 + 3.3.1 + + + diff --git a/plugins/maven/src/test/data/local1/commons-io/commons-io/maven-metadata-central.xml b/plugins/maven/src/test/data/local1/commons-io/commons-io/maven-metadata-central.xml new file mode 100644 index 000000000000..99bcd1f0240a --- /dev/null +++ b/plugins/maven/src/test/data/local1/commons-io/commons-io/maven-metadata-central.xml @@ -0,0 +1,10 @@ + + + commons-io + commons-io + + + 2.4 + + + diff --git a/plugins/maven/src/test/data/local1/junit/junit/maven-metadata-central.xml b/plugins/maven/src/test/data/local1/junit/junit/maven-metadata-central.xml new file mode 100644 index 000000000000..66cf8d14bf2c --- /dev/null +++ b/plugins/maven/src/test/data/local1/junit/junit/maven-metadata-central.xml @@ -0,0 +1,12 @@ + + + junit + junit + + + 3.8.1 + 3.8.2 + 4.0 + + + diff --git a/plugins/maven/src/test/data/local1/org/ow2/asm/asm/maven-metadata-central.xml b/plugins/maven/src/test/data/local1/org/ow2/asm/asm/maven-metadata-central.xml new file mode 100644 index 000000000000..e79b52238771 --- /dev/null +++ b/plugins/maven/src/test/data/local1/org/ow2/asm/asm/maven-metadata-central.xml @@ -0,0 +1,10 @@ + + + org.ow2.asm + asm + + + 4.1 + + + diff --git a/plugins/maven/src/test/data/local2/jmock/jmock/maven-metadata-central.xml b/plugins/maven/src/test/data/local2/jmock/jmock/maven-metadata-central.xml new file mode 100644 index 000000000000..794fddef6ceb --- /dev/null +++ b/plugins/maven/src/test/data/local2/jmock/jmock/maven-metadata-central.xml @@ -0,0 +1,12 @@ + + + jmock + jmock + + + 1.0.0 + 1.1.0 + 1.2.0 + + + diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java index d3cba0bdb561..ee767c7ae4e8 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java +++ b/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 "" + content + "" + " " + " jb-central-proxy" + " " + mirror + "" + - " *" + + " external:*" + " " + "" + ""; diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.java index f667e1eb585e..9a2c8ea4416a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.java +++ b/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;