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-116921 Run configuration can't resolve test dependency when "Resolve workspace artifacts" ticked on.

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-11-25 22:00:12 +04:00
parent 12909239c4
commit d06f31a431
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/artifact-resolver-m2/src/org/jetbrains/idea/maven/artifactResolver/common/MavenModuleMap.java
+4
View File
@@ -56,6 +56,10 @@ public class MavenModuleMap {
public boolean resolveToModule(Artifact artifact) {
String extension = artifact.getArtifactHandler().getExtension();
if ("jar".equals(extension) && "test-jar".equals(artifact.getType())) {
extension = "test-jar";
}
File file = findArtifact(artifact.getGroupId(), artifact.getArtifactId(), extension, artifact.getBaseVersion());
if(file == null) {
plugins/maven/artifact-resolver-m3/src/org/jetbrains/idea/maven/artifactResolver/MyWorkspaceReader.java
+6 -1
View File
@@ -52,7 +52,12 @@ public class MyWorkspaceReader implements WorkspaceReader {
}
public File findArtifact(Artifact artifact) {
return MavenModuleMap.getInstance().findArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getExtension(),
String type = artifact.getExtension();
if ("jar".equals(type) && "tests".equals(artifact.getClassifier())) {
type = "test-jar";
}
return MavenModuleMap.getInstance().findArtifact(artifact.getGroupId(), artifact.getArtifactId(), type,
artifact.getBaseVersion());
}
plugins/maven/artifact-resolver-m31/src/org/jetbrains/idea/maven/artifactResolver/IntelliJWorkspaceReaderM31.java
+6 -1
View File
@@ -52,7 +52,12 @@ public class IntelliJWorkspaceReaderM31 implements WorkspaceReader {
}
public File findArtifact(Artifact artifact) {
return MavenModuleMap.getInstance().findArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getExtension(),
String type = artifact.getExtension();
if ("jar".equals(type) && "tests".equals(artifact.getClassifier())) {
type = "test-jar";
}
return MavenModuleMap.getInstance().findArtifact(artifact.getGroupId(), artifact.getArtifactId(), type,
artifact.getBaseVersion());
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExternalParameters.java
+6
View File
@@ -260,6 +260,12 @@ public class MavenExternalParameters {
+ ':' + mavenProject.getMavenId().getVersion(),
mavenProject.getFile().getPath());
res.setProperty(mavenProject.getMavenId().getGroupId()
+ ':' + mavenProject.getMavenId().getArtifactId()
+ ":test-jar"
+ ':' + mavenProject.getMavenId().getVersion(),
mavenProject.getTestOutputDirectory());
res.setProperty(mavenProject.getMavenId().getGroupId()
+ ':' + mavenProject.getMavenId().getArtifactId()
+ ':' + mavenProject.getPackaging()