Merge branch '1.2.x'

2015-06-15 11:38:24 -07:00
parent 49e538248b d6e24a15de
commit d87f2713af
7 changed files with 84 additions and 54 deletions
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
@@ -213,11 +213,9 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 		if (classifier.length() > 0 && !classifier.startsWith("-")) {
 			classifier = "-" + classifier;
 		}
-
 		if (!this.outputDirectory.exists()) {
 			this.outputDirectory.mkdirs();
 		}
-
 		return new File(this.outputDirectory, this.finalName + classifier + "."
 				+ this.project.getArtifact().getArtifactHandler().getExtension());
 	}