From d80906a68edb4d6793678da63cce0d1b1b7d0e6b Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Fri, 29 Jul 2016 11:44:24 +0300 Subject: [PATCH] maven: ejb-client artifacts building fix --- .../main/java/org/jetbrains/idea/maven/utils/MavenUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java index bc95d863e499..13c745d30fda 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java @@ -57,7 +57,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.util.DisposeAwareRunnable; -import com.intellij.util.Function; import com.intellij.util.SystemProperties; import com.intellij.util.concurrency.Semaphore; import com.intellij.util.containers.ContainerUtil; @@ -104,6 +103,8 @@ public class MavenUtil { public static final String M2_CONF_FILE = "m2.conf"; public static final String REPOSITORY_DIR = "repository"; public static final String LIB_DIR = "lib"; + public static final String CLIENT_ARTIFACT_SUFFIX = "-client"; + public static final String CLIENT_EXPLODED_ARTIFACT_SUFFIX = CLIENT_ARTIFACT_SUFFIX + " exploded"; @SuppressWarnings("unchecked") private static final Pair[] SUPER_POM_PATHS = new Pair[]{ @@ -934,7 +935,7 @@ public class MavenUtil { } public static String getEjbClientArtifactName(Module module, boolean exploded) { - return module.getName() + ":ejb-client" + (exploded ? " exploded" : ""); + return module.getName() + ":ejb" + (exploded ? CLIENT_EXPLODED_ARTIFACT_SUFFIX : CLIENT_ARTIFACT_SUFFIX); } public static String getIdeaVersionToPassToMavenProcess() {