From 022f7e86a095fa423153d18dca5eb610a63e006e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Dec 2016 11:59:01 +0100 Subject: [PATCH] Align library file naming mapping This commit aligns the mapping from library to name to the default behaviour of the `maven-war-plugin`. Previously, our plugin would use the full version of the library (i.e. including build timestamp if there is one), rather than using the `baseVersion` property. Closes gh-7743 --- .../org/springframework/boot/maven/ArtifactsLibraries.java | 2 +- .../springframework/boot/maven/ArtifactsLibrariesTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java index 77e7bdaa77..dd83710824 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java @@ -110,7 +110,7 @@ public class ArtifactsLibraries implements Libraries { private String getFileName(Artifact artifact) { StringBuilder sb = new StringBuilder(); - sb.append(artifact.getArtifactId()).append("-").append(artifact.getVersion()); + sb.append(artifact.getArtifactId()).append("-").append(artifact.getBaseVersion()); String classifier = artifact.getClassifier(); if (classifier != null) { sb.append("-").append(classifier); diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java index c2e3fb8149..243ab5dfb1 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java @@ -114,14 +114,14 @@ public class ArtifactsLibrariesTests { given(artifact1.getScope()).willReturn("compile"); given(artifact1.getGroupId()).willReturn("g1"); given(artifact1.getArtifactId()).willReturn("artifact"); - given(artifact1.getVersion()).willReturn("1.0"); + given(artifact1.getBaseVersion()).willReturn("1.0"); given(artifact1.getFile()).willReturn(new File("a")); given(artifact1.getArtifactHandler()).willReturn(this.artifactHandler); given(artifact2.getType()).willReturn("jar"); given(artifact2.getScope()).willReturn("compile"); given(artifact2.getGroupId()).willReturn("g2"); given(artifact2.getArtifactId()).willReturn("artifact"); - given(artifact2.getVersion()).willReturn("1.0"); + given(artifact2.getBaseVersion()).willReturn("1.0"); given(artifact2.getFile()).willReturn(new File("a")); given(artifact2.getArtifactHandler()).willReturn(this.artifactHandler); this.artifacts = new LinkedHashSet(Arrays.asList(artifact1, artifact2));