From 112f93168f9831e8997d35606e2b78ff2c563045 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 27 Sep 2016 17:05:14 +0300 Subject: [PATCH] IDEA-113485 Maven artifact name should resolve to SNAPSHOT instead of timestamp --- .../org/jetbrains/idea/maven/model/MavenArtifact.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java index c30101d8f82c..74f100635173 100644 --- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java +++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java @@ -160,14 +160,17 @@ public class MavenArtifact implements Serializable, MavenCoordinate { public String getFileNameWithBaseVersion(@Nullable String extraArtifactClassifier, @Nullable String customExtension) { StringBuilder res = new StringBuilder(); - appendFileName(res, extraArtifactClassifier, customExtension); + appendFileName(res, extraArtifactClassifier, customExtension, true); return res.toString(); } - private void appendFileName(StringBuilder result, @Nullable String extraArtifactClassifier, @Nullable String customExtension) { + private void appendFileName(StringBuilder result, + @Nullable String extraArtifactClassifier, + @Nullable String customExtension, + boolean useBaseVersion) { result.append(myArtifactId); result.append('-'); - result.append(myVersion); + result.append(useBaseVersion ? myBaseVersion : myVersion); String fullClassifier = getFullClassifier(extraArtifactClassifier); if (fullClassifier != null) { @@ -187,7 +190,7 @@ public class MavenArtifact implements Serializable, MavenCoordinate { result.append(myBaseVersion); result.append('/'); - appendFileName(result, extraArtifactClassifier, customExtension); + appendFileName(result, extraArtifactClassifier, customExtension, false); return result.toString(); }