Merge pull request #297 from basil/classifier

Include classifier when computing final name
jenkinsci · Feb 22, 2022 · 1c1e31d · 1c1e31d
2 parents 5a9dd2c + 5318ed9
commit 1c1e31d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java
@@ -95,8 +95,19 @@ public String getId() {
      * @return converted filename of the artifact
      */
     public String getDefaultFinalName() {
-        return artifact.getArtifactId() + "-" + artifact.getVersion() + "." +
-            artifact.getArtifactHandler().getExtension();
+        StringBuilder path = new StringBuilder();
+        path.append(artifact.getArtifactId());
+        path.append('-');
+        path.append(artifact.getVersion());
+        if (artifact.getClassifier() != null && !artifact.getClassifier().isEmpty()) {
+            path.append('-');
+            path.append(artifact.getClassifier());
+        }
+        if (!artifact.getArtifactHandler().getExtension().isEmpty()) {
+            path.append('.');
+            path.append(artifact.getArtifactHandler().getExtension());
+        }
+        return path.toString();
     }
 
     public boolean isOptional() {