Merge pull request #5355 from bjhargrave/maven-artifact-extension

maven: Use getExtension to map the artifact type into the file extension
bndtools · Aug 23, 2022 · 74b8924 · 74b8924
2 parents 60392b5 + ae867c4
commit 74b8924
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java b/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java
@@ -677,10 +677,10 @@ private String getExtension(String type) {
 	private String createArtifactName(Artifact artifact) {
 		String classifier = artifact.getClassifier();
 		if ((classifier == null) || classifier.isEmpty()) {
-			return String.format("%s-%s.%s", artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
+			return String.format("%s-%s.%s", artifact.getArtifactId(), artifact.getVersion(), getExtension(artifact.getType()));
 		}
 		return String.format("%s-%s-%s.%s", artifact.getArtifactId(), artifact.getVersion(), classifier,
-			artifact.getType());
+			getExtension(artifact.getType()));
 	}
 
 	private File loadProperties(Builder builder) throws Exception {