Merge branch '2.1.x'

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

@@ -89,6 +89,13 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 	@Parameter(defaultValue = "${project.build.directory}", required = true)
 	private File outputDirectory;
 
+	/**
+	 * Name of the generated archive.
+	 * @since 1.0
+	 */
+	@Parameter(defaultValue = "${project.build.finalName}", readonly = true)
+	private String finalName;
+
 	/**
 	 * Skip the execution.
 	 * @since 1.2
@@ -259,8 +266,7 @@ private File getTargetFile() {
 		if (!this.outputDirectory.exists()) {
 			this.outputDirectory.mkdirs();
 		}
-		String finalName = this.project.getBuild().getFinalName();
-		return new File(this.outputDirectory, finalName + classifier + "."
+		return new File(this.outputDirectory, this.finalName + classifier + "."
 				+ this.project.getArtifact().getArtifactHandler().getExtension());
 	}