diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.183 b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.183 index 5a53fb684ec..e105741e24d 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.183 +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.183 @@ -46,7 +46,6 @@ import org.jetbrains.idea.maven.execution.*; import org.jetbrains.idea.maven.model.MavenArtifact; import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.project.*; -import org.jetbrains.idea.maven.server.MavenServerManager; import org.jetbrains.jps.model.java.JavaResourceRootType; import org.jetbrains.jps.model.java.JavaSourceRootProperties; import org.jetbrains.jps.model.java.JavaSourceRootType; @@ -389,34 +388,14 @@ public abstract class MavenImportingTestCase extends MavenTestCase { } protected void importProjectWithProfiles(String... profiles) { - doImportProjects(true, Collections.singletonList(myProjectPom), profiles); - } - - protected void importProject(VirtualFile file) { - importProjects(file); + doImportProjects(Collections.singletonList(myProjectPom), profiles); } protected void importProjects(VirtualFile... files) { - doImportProjects(true, Arrays.asList(files)); + doImportProjects(Arrays.asList(files)); } - protected void importProjectWithMaven3(@NonNls String xml) throws IOException { - createProjectPom(xml); - importProjectWithMaven3(); - } - - protected void importProjectWithMaven3() { - importProjectWithMaven3WithProfiles(); - } - - protected void importProjectWithMaven3WithProfiles(String... profiles) { - doImportProjects(false, Collections.singletonList(myProjectPom), profiles); - } - - private void doImportProjects(boolean useMaven2, final List files, String... profiles) { - if (useMaven2) - MavenServerManager.getInstance().setUseMaven2(); - + private void doImportProjects(List files, String... profiles) { initProjectsManager(false); readProjects(files, profiles);