Merge branch '1.2.x'

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -214,7 +214,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 			classifier = "-" + classifier;
 		}
 		return new File(this.outputDirectory, this.finalName + classifier + "."
-				+ this.project.getPackaging());
+				+ this.project.getArtifact().getArtifactHandler().getExtension());
 	}
 
 	private LaunchScript getLaunchScript() throws IOException {