MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-109771 Incorrent Maven dependency resolution with war classes dependency

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-09-10 18:24:40 +04:00
parent eede608d94
commit c837b30b81
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+5 -1
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.idea.maven.importing;
import com.google.common.collect.ImmutableSet;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.module.Module;
@@ -38,11 +39,14 @@ import org.jetbrains.idea.maven.utils.MavenUtil;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class MavenModuleImporter {
public static final String SUREFIRE_PLUGIN_LIBRARY_NAME = "maven-surefire-plugin urls";
private static final Set<String> IMPORTED_CLASSIFIERS = ImmutableSet.of("client");
private final Module myModule;
private final MavenProjectsTree myMavenTree;
private final MavenProject myMavenProject;
@@ -204,7 +208,7 @@ public class MavenModuleImporter {
addAttachArtifactDependency(buildHelperCfg, scope, depProject, artifact);
}
if (artifact.getClassifier() != null
if (IMPORTED_CLASSIFIERS.contains(artifact.getClassifier())
&& !isTestJar
&& !"system".equals(artifact.getScope())
&& !"false".equals(System.getProperty("idea.maven.classifier.dep"))) {